summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti <silenio_quarti@ca.ibm.com>2012-08-24 16:24:39 -0400
committerSilenio Quarti <silenio_quarti@ca.ibm.com>2012-08-24 16:24:39 -0400
commitddd37d85332b6f06048142632a9d3dfc9239b814 (patch)
treeb59b65ccd11c3885cd296eabb9a60b9322682425
parentba0496f9a8a66760fc94c587abb32b76fa4bc8d3 (diff)
downloadeclipse.platform.swt-ddd37d85332b6f06048142632a9d3dfc9239b814.tar.gz
eclipse.platform.swt-ddd37d85332b6f06048142632a9d3dfc9239b814.tar.xz
eclipse.platform.swt-ddd37d85332b6f06048142632a9d3dfc9239b814.zip
Bug 387518 - Extremely wide combo box causes X11 crash
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java2
1 files changed, 1 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 b34449a7ea..942aa0c249 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
@@ -341,7 +341,7 @@ void clearText () {
public Point computeSize (int wHint, int hHint, boolean changed) {
checkWidget ();
- if ((style & SWT.READ_ONLY) != 0) {
+ if ((style & SWT.READ_ONLY) != 0 || menuHandle != 0) {
return computeNativeSize (handle, wHint, hHint, changed);
}
if (wHint != SWT.DEFAULT && wHint < 0) wHint = 0;