delete children in ~wxWindow dtor and not in the base class ~wxWindowNative as it...

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

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index 6cc3aa1a791aed31425708df2f036b244f611a1b..fee72b9b912935c4418683323c776799c144c7f8 100644 (file)
--- 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 )