applied patch 433505 (MDI parent activation fix)

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 46f92ba543237f9e2bdfc63293c8227c63c07e1f..e2d239595af5897a4f8963d1a3c2650af241f19c 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -979,7 +979,10 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
         parent->m_currentChild = NULL;
 
         HMENU parent_menu = (HMENU)parent->GetWinMenu();
         parent->m_currentChild = NULL;
 
         HMENU parent_menu = (HMENU)parent->GetWinMenu();

-        if ( parent_menu )
+
+        // activate the the parent menu only when there is no other child
+        // that has been activated
+        if ( parent_menu && !hwndAct )

         {
             parent->m_parentFrameActive = TRUE;
 
         {
             parent->m_parentFrameActive = TRUE;