mdi menu updates fixed (after SF 1012653)

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

diff --git a/include/wx/frame.h b/include/wx/frame.h
index cc09dfbcb473bbdec0e77ee03562dbd8e2e56de2..adb10c54a0b43c4ec8ab44c5b1f40d5ad45efbb4 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -157,7 +157,7 @@ public:
 
     // send wxUpdateUIEvents for all menu items in the menubar,
     // or just for menu if non-NULL
-    void DoMenuUpdates(wxMenu* menu = NULL);
+    virtual void DoMenuUpdates(wxMenu* menu = NULL);
 #endif // wxUSE_MENUS
 
     // do the UI update processing for this window

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 714c0975925bbf47046d066544bd9ff69896e61a..a6fc56445b67746d4a9338aa649fc12ab1e4785d 100644 (file)
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -69,7 +69,8 @@ public:
     // MDI windows menu
     wxMenu* GetWindowMenu() const { return m_windowMenu; };
     void SetWindowMenu(wxMenu* menu) ;
-
+    virtual void DoMenuUpdates(wxMenu* menu = NULL);
+    
     // MDI operations
     // --------------
     virtual void Cascade();

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index b1d924d27dacc1598cb24b205c654f053f658c8e..4bbb0a2b560ddb44910e41ec62500e7f7f54e2f2 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -300,6 +300,34 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
     }
 }
 
+void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu)
+{
+    wxMDIChildFrame *child = GetActiveChild();
+    if ( child )
+    {
+        wxEvtHandler* source = child->GetEventHandler();
+        wxMenuBar* bar = child->GetMenuBar();
+
+        if (menu)
+        {
+            menu->UpdateUI(source);
+        }
+        else
+        {
+            if ( bar != NULL )
+            {
+                int nCount = bar->GetMenuCount();
+                for (int n = 0; n < nCount; n++)
+                bar->GetMenu(n)->UpdateUI(source);
+            }
+        }
+    }
+    else
+    {
+        wxFrameBase::DoMenuUpdates(menu);
+    }
+}
+
 void wxMDIParentFrame::OnSize(wxSizeEvent&)
 {
     if ( GetClientWindow() )