No *.h in src/common/ anymore.

[wxWidgets.git] / src / mac / carbon / menuitem.cpp

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index e1062e4597b9f0db5f9fd97cca134f55af93be07..36c90003f5c50f3eeecc4b6e3291aa5235bc8843 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -13,6 +13,8 @@
 // headers & declarations
 // ============================================================================
 
+#include "wx/wxprec.h"
+
 #include "wx/app.h"
 #include "wx/menu.h"
 #include "wx/menuitem.h"
@@ -155,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