From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 16 Jun 2001 01:21:46 +0000 (+0000)
Subject: applied patch 433505 (MDI parent activation fix)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f407580407d526155422072a27c2371bc2ffec08

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 46f92ba543..e2d239595a 100644
--- 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();
-        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;