switching to IconRefs for menu bitmaps

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index ccfcf8da8ded0ac4e73e73e10fcd596bdf3067e3..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 ;
     if ( m_bitmap.Ok() )
     {
         ControlButtonContentInfo info ;

-        wxMacCreateBitmapButton( &info , m_bitmap , kControlContentCIconHandle ) ;
+        wxMacCreateBitmapButton( &info , m_bitmap ) ;

         if ( info.contentType != kControlNoContent )
         {
         if ( info.contentType != kControlNoContent )
         {

-            if ( info.contentType == kControlContentCIconHandle )
+            if ( info.contentType == kControlContentIconRef )

                 SetMenuItemIconHandle( mhandle , index , 
                 SetMenuItemIconHandle( mhandle , index , 

-                    kMenuColorIconType , (Handle) info.u.cIconHandle ) ;
+                    kMenuIconRefType , (Handle) info.u.iconRef ) ;

         }
         wxMacReleaseBitmapButton( &info ) ;
             
         }
         wxMacReleaseBitmapButton( &info ) ;