Weekly catch-up

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 2d3bee6535cc933bd69d3e3592bbb6789dd417d1..3c6e0b747e92f63e212927ea9fd3960e00fb8575 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -509,6 +509,14 @@ bool wxWindowOS2::Enable(
     if ( hWnd )
         ::WinEnableWindow(hWnd, (BOOL)bEnable);
 
     if ( hWnd )
         ::WinEnableWindow(hWnd, (BOOL)bEnable);
 

+    //
+    // The logic below doesn't apply to the top level windows -- otherwise
+    // showing a modal dialog would result in total greying out (and ungreying
+    // out later) of everything which would be really ugly
+    //
+    if (IsTopLevel())
+        return TRUE;
+

     wxWindowList::Node*             pNode = GetChildren().GetFirst();
 
     while (pNode)
     wxWindowList::Node*             pNode = GetChildren().GetFirst();
 
     while (pNode)