From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 6 Feb 2005 11:12:48 +0000 (+0000)
Subject: Fix for menu items not being disabled after a modal dialog is shown
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ef9ed995cf3ae626826e9729f9457862ef2f2cf3

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 1d27c95fbf..36c90003f5 100644
--- 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