wxMenuBar::IsEnabled() now returns TRUE sometimes too

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

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 019415a9e85b9f9b3ab7a2da9591a1ee2dd0d330..87c892530b94c2ad7c4af211e18a803367915872 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -778,7 +778,8 @@ bool wxMenuBar::IsEnabled(int id) const
 
     int flag = ::GetMenuState(GetHmenuOf(itemMenu), id, MF_BYCOMMAND) ;
 
-    return (flag & MF_ENABLED) != 0;
+    // don't "and" with MF_ENABLED because its value is 0
+    return (flag & MF_DISABLED) == 0;
 }
 
 void wxMenuBar::SetLabel(int id, const wxString& label)