drawing circles with a transparent pen was filling of course...

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

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index 6974e7870cb9c72d4207e6200ca7bb200ec3b597..0b9094a12f4c524257e157a24749c34064865f5b 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -87,12 +87,12 @@ void wxMenuItem::UpdateItemBitmap()
     if ( m_bitmap.Ok() )
     {
         ControlButtonContentInfo info ;
-        wxMacCreateBitmapButton( &info , m_bitmap , kControlContentCIconHandle ) ;
+        wxMacCreateBitmapButton( &info , m_bitmap ) ;
         if ( info.contentType != kControlNoContent )
         {
-            if ( info.contentType == kControlContentCIconHandle )
+            if ( info.contentType == kControlContentIconRef )
                 SetMenuItemIconHandle( mhandle , index , 
-                    kMenuColorIconType , (Handle) info.u.cIconHandle ) ;
+                    kMenuIconRefType , (Handle) info.u.iconRef ) ;
         }
         wxMacReleaseBitmapButton( &info ) ;
             
@@ -158,18 +158,18 @@ void wxMenuItem::UpdateItemText()
 
 void wxMenuItem::Enable(bool 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 (( m_isEnabled != bDoEnable
 #if TARGET_CARBON
-         || GetId() == wxApp::s_macPreferencesMenuItemId
-         || GetId() == wxApp::s_macExitMenuItemId
-         || GetId() == wxApp::s_macAboutMenuItemId
+      // avoid changing menuitem state when menu is disabled
+      // eg. BeginAppModalStateForWindow() will disable menus and ignore this change
+      // which in turn causes m_isEnabled to become out of sync with real menuitem state
+         && !(m_parentMenu && !IsMenuItemEnabled(MAC_WXHMENU(m_parentMenu->GetHMenu()), 0)) )
+      // always update builtin menuitems
+         || (   GetId() == wxApp::s_macPreferencesMenuItemId
+             || GetId() == wxApp::s_macExitMenuItemId
+             || GetId() == wxApp::s_macAboutMenuItemId
 #endif
-         ) 
+         ))
     {
         wxMenuItemBase::Enable( bDoEnable ) ;
         UpdateItemStatus() ;