X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a9412f8f03171fdd3606a4ad3db9c9da8fe6bd7c..8da1f9a99ee0ff9493cc7845ec13100cdeac431c:/src/mac/carbon/menuitem.cpp diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp index 6cc3aa1a79..fee72b9b91 100644 --- a/src/mac/carbon/menuitem.cpp +++ b/src/mac/carbon/menuitem.cpp @@ -156,7 +156,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() ; @@ -208,7 +214,7 @@ void wxMenuItem::Check(bool bDoCheck) } // also uncheck all the other items in this radio group - wxMenuItemList::Node *node = items.Item(start); + wxMenuItemList::compatibility_iterator node = items.Item(start); for ( int n = start; n <= end && node; n++ ) { if ( n != pos )