From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 31 Jan 2005 15:11:10 +0000 (+0000)
Subject: fixed the checked flag value for events from check items in popup menus (patch 107901... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/36f1f456497faa46bfdaf3af9936bb4f7498a6b4

fixed the checked flag value for events from check items in popup menus (patch 1079015; closes bug 1071598)


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

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index d9f510cb85..3b1499ce24 100644
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -642,16 +642,12 @@ void wxMenu::SetTitle(const wxString& label)
 bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
 {
     // ignore commands from the menu title
-
-    // NB: VC++ generates wrong assembler for `if ( id != idMenuTitle )'!!
     if ( id != (WXWORD)idMenuTitle )
     {
-        // VZ: previosuly, the command int was set to id too which was quite
-        //     useless anyhow (as it could be retrieved using GetId()) and
-        //     uncompatible with wxGTK, so now we use the command int instead
-        //     to pass the checked status
-        UINT menuState = ::GetMenuState(GetHmenu(), id, MF_BYCOMMAND) ;
-        SendEvent(id, menuState & MF_CHECKED);
+        // get the checked status of the command: notice that menuState is the
+        // old state of the menu, so the test for MF_CHECKED must be inversed
+        UINT menuState = ::GetMenuState(GetHmenu(), id, MF_BYCOMMAND);
+        SendEvent(id, !(menuState & MF_CHECKED));
     }
 
     return true;