summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatoly Spektor <aspektor@redhat.com>2012-08-07 14:34:31 -0400
committerAnatoly Spektor <aspektor@redhat.com>2012-08-07 14:34:31 -0400
commit758fea8d1686ce388e1d704038f537b23366a799 (patch)
tree521a0c08968f7f02cbf20d5d95e09742fc3613b5
parentb0b42620e24ecaac47685aa1e7c1a94402f72be0 (diff)
parentc54e37d49f03d2ce2796165cf58ab76d1511b7f5 (diff)
downloadeclipse.platform.swt-758fea8d1686ce388e1d704038f537b23366a799.tar.gz
eclipse.platform.swt-758fea8d1686ce388e1d704038f537b23366a799.tar.xz
eclipse.platform.swt-758fea8d1686ce388e1d704038f537b23366a799.zip
Merge branch 'master' of http://git.eclipse.org/gitroot/platform/eclipse.platform.swt.git
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java2
1 files changed, 2 insertions, 0 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 db7c8c5518..6b4b552719 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
@@ -1027,6 +1027,8 @@ String getText (int start, int stop) {
*/
public int getTextHeight () {
checkWidget();
+ GtkRequisition requisition = new GtkRequisition ();
+ gtk_widget_size_request (handle, requisition);
return OS.GTK_WIDGET_REQUISITION_HEIGHT (handle);
}