Fix for menu items not being disabled after a modal dialog is shown

on app startup

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

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index 1d27c95fbf4a307c6069ac4a170a75170ac7d558..36c90003f5c50f3eeecc4b6e3291aa5235bc8843 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -157,7 +157,12 @@ void wxMenuItem::UpdateItemText()
 
 void wxMenuItem::Enable(bool bDoEnable)
 {
-    if ( m_isEnabled != bDoEnable
+    // Due to desychronisation of m_isEnabled from the
+    // true state after a modal dialog is shown in OnInit,
+    // and subsequent enabling of menu items that should be
+    // disabled, we now always update the item's status.
+    
+    if ( /* m_isEnabled != bDoEnable */ true
 #if TARGET_CARBON
          || GetId() == wxApp::s_macPreferencesMenuItemId
          || GetId() == wxApp::s_macExitMenuItemId