corrections after last commit, (see #10452 comment:6)

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

diff --git a/src/msw/menuitem.cpp b/src/msw/menuitem.cpp
index 38088dba4b33d09b7442a1b3d7bc282d70559fb6..13a28675cd601726eed57ba1e3fc5c97ea9e18cd 100644 (file)
--- a/src/msw/menuitem.cpp
+++ b/src/msw/menuitem.cpp
@@ -383,11 +383,15 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
     // work as it resets the menu bitmap, so we need to first get the old item
     // state and then modify it
     const bool isLaterThanWin95 = wxGetWinVersion() > wxWinVersion_95;
     // work as it resets the menu bitmap, so we need to first get the old item
     // state and then modify it
     const bool isLaterThanWin95 = wxGetWinVersion() > wxWinVersion_95;

-    info.fMask = MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS | MIIM_DATA;
+    info.fMask = MIIM_STATE |
+                 MIIM_ID |
+                 MIIM_SUBMENU |
+                 MIIM_CHECKMARKS |
+                 MIIM_DATA;

     if ( isLaterThanWin95 )
         info.fMask |= MIIM_BITMAP | MIIM_FTYPE;
     else
     if ( isLaterThanWin95 )
         info.fMask |= MIIM_BITMAP | MIIM_FTYPE;
     else

-        info.fMask = MIIM_TYPE;
+        info.fMask |= MIIM_TYPE;

     if ( !::GetMenuItemInfo(hMenu, id, FALSE, &info) )
     {
         wxLogLastError(wxT("GetMenuItemInfo"));
     if ( !::GetMenuItemInfo(hMenu, id, FALSE, &info) )
     {
         wxLogLastError(wxT("GetMenuItemInfo"));