Use wxMBConvUTF8 when G_FILENAME_ENCODING is UTF-8, and set

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

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index ccfcf8da8ded0ac4e73e73e10fcd596bdf3067e3..5188955ad40e091e2a1ffbdb049dd66eec554a04 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -86,16 +86,17 @@ void wxMenuItem::UpdateItemBitmap()
         
     if ( m_bitmap.Ok() )
     {
+#if wxUSE_BMPBUTTON
         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 ) ;
-            
+#endif            
     }
 }