do nothing in ShowHidden() if the flag doesn't change (patch 1678963)

[wxWidgets.git] / src / msw / window.cpp

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 7d80f8dd6bee78f2c07526acc91f7be1d36c5231..5ed982abb3737d74693238d00aad6efc1ca65490 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -650,6 +650,47 @@ wxWindow *wxWindowBase::DoFindFocus()
 
 bool wxWindowMSW::Enable(bool enable)
 {
+    // we shouldn't really enable the window if our parent is currently
+    // disabled because under MSW this would indeed show the window in enabled
+    // state but it still wouldn't respond to the input (as its parent is
+    // disabled), so just update the internal m_childrenDisabled list in this
+    // case and our state will be really changed when the parent is enabled
+
+    // the logic above doesn't apply to top level windows, of course
+    wxWindowMSW * const parent = IsTopLevel() ? NULL : GetParent();
+    if ( parent && !parent->IsEnabled() && !IsEnabled() )
+    {
+        // it's a reference as we can create it below
+        wxWindowList *& disabledSiblings = parent->m_childrenDisabled;
+
+        bool rc = false;
+        if ( enable )
+        {
+            // shouldn't be disabled when the parent is reenabled
+            if ( disabledSiblings )
+            {
+                wxWindowList::compatibility_iterator
+                    i = disabledSiblings->Find(this);
+                if ( i )
+                {
+                    disabledSiblings->Erase(i);
+                    rc = true;
+                }
+            }
+            //else: nothing to do
+        }
+        else // !enable
+        {
+            // should disable this window when the parent is enabled
+            if ( !disabledSiblings )
+                disabledSiblings = new wxWindowList;
+
+            disabledSiblings->Append(this);
+        }
+
+        return rc;
+    }
+
     if ( !wxWindowBase::Enable(enable) )
         return false;
 
@@ -5779,7 +5820,7 @@ static inline bool wxIsKeyDown(WXWORD vk)
     switch (vk)
     {
         case VK_LBUTTON:
-            if (GetSystemMetrics(SM_SWAPBUTTON)) vk = VK_RBUTTON; 
+            if (GetSystemMetrics(SM_SWAPBUTTON)) vk = VK_RBUTTON;
             break;
         case VK_RBUTTON:
             if (GetSystemMetrics(SM_SWAPBUTTON)) vk = VK_LBUTTON;