summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Northover <steve>2008-04-29 13:42:20 +0000
committerSteve Northover <steve>2008-04-29 13:42:20 +0000
commitb8e1e7226879e9498e31b040571c81afcdc637d6 (patch)
tree5d01cf630a7bbd51e2596f56ba27f69e63d75fea
parent082612c1a160d2380ca9de98c04c3b21a8c50c95 (diff)
downloadeclipse.platform.swt-b8e1e7226879e9498e31b040571c81afcdc637d6.tar.gz
eclipse.platform.swt-b8e1e7226879e9498e31b040571c81afcdc637d6.tar.xz
eclipse.platform.swt-b8e1e7226879e9498e31b040571c81afcdc637d6.zip
229172 - [Win32] MessageBox gets stuck in event loop
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java
index 685df4045d..5e0520fcbe 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java
@@ -1723,6 +1723,9 @@ public void setVisible (boolean visible) {
if ((style & mask) != 0) {
if (visible) {
display.setModalShell (this);
+ if ((style & (SWT.APPLICATION_MODAL | SWT.SYSTEM_MODAL)) != 0) {
+ display.setModalDialog (null);
+ }
Control control = display._getFocusControl ();
if (control != null && !control.isActive ()) {
bringToTop ();