diff options
| author | Alexander Kurtakov <akurtako@redhat.com> | 2012-10-25 16:13:24 +0300 |
|---|---|---|
| committer | Alexander Kurtakov <akurtako@redhat.com> | 2012-10-25 16:13:24 +0300 |
| commit | a3b341da6419dd861e4fed79ed72137e2ca99fbd (patch) | |
| tree | 9ce1a8017db0572b94b84b0c79e9e1c625b4dd30 /bundles/org.eclipse.swt/Eclipse SWT/gtk/org | |
| parent | 8448d197b76473a9bbdfd0dc7b5d890dae31fb27 (diff) | |
| download | eclipse.platform.swt-a3b341da6419dd861e4fed79ed72137e2ca99fbd.tar.gz eclipse.platform.swt-a3b341da6419dd861e4fed79ed72137e2ca99fbd.tar.xz eclipse.platform.swt-a3b341da6419dd861e4fed79ed72137e2ca99fbd.zip | |
Don't use GTK_WIDGET_REQUISITION_HEIGHT in GTK 3.
Return requisition.height instead.
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java index f54ff074b5..dbb5904c55 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java @@ -1046,7 +1046,11 @@ public int getTextHeight () { checkWidget(); GtkRequisition requisition = new GtkRequisition (); gtk_widget_size_request (handle, requisition); - return OS.GTK_WIDGET_REQUISITION_HEIGHT (handle); + if (OS.GTK_VERSION >= OS.VERSION(3, 0, 0)) { + return requisition.height; + } else { + return OS.GTK_WIDGET_REQUISITION_HEIGHT (handle); + } } /** |