FixMath fix

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

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index f3c4f869eeed010e5f9a57d4b2c0bbad1a8aadb6..1d27c95fbf4a307c6069ac4a170a75170ac7d558 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"
@@ -46,8 +48,7 @@ wxMenuItem::wxMenuItem(wxMenu *pParentMenu,
                        wxMenu *pSubMenu) 
           : wxMenuItemBase(pParentMenu, id, text, strHelp, kind, pSubMenu)
 {
-    // TO DISCUSS on dev : whether we can veto id 0
-    // wxASSERT_MSG( id != 0 || pSubMenu != NULL , wxT("A MenuItem ID of Zero does not work under Mac") ) ;
+    wxASSERT_MSG( id != 0 || pSubMenu != NULL , wxT("A MenuItem ID of Zero does not work under Mac") ) ;
     
     // In other languages there is no difference in naming the Exit/Quit menu item between MacOS and Windows guidelines
     // therefore these item must not be translated
@@ -156,7 +157,13 @@ void wxMenuItem::UpdateItemText()
 
 void wxMenuItem::Enable(bool bDoEnable)
 {
-    if ( m_isEnabled != bDoEnable ) 
+    if ( m_isEnabled != bDoEnable
+#if TARGET_CARBON
+         || GetId() == wxApp::s_macPreferencesMenuItemId
+         || GetId() == wxApp::s_macExitMenuItemId
+         || GetId() == wxApp::s_macAboutMenuItemId
+#endif
+         ) 
     {
         wxMenuItemBase::Enable( bDoEnable ) ;
         UpdateItemStatus() ;