Ensure popup menus can display sub-menus.

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 47a6fb92c8ac7da84a0ef1559b66ccdaa7f79c3b..634ea0e03ff2bc4ef3118274810381fbb00e97fc 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -59,7 +59,7 @@ void UMAInitToolbox( UInt16 WXUNUSED(inMoreMastersCalls),
 
 // menu manager
 
-#if wxMAC_USE_COCOA == 0
+#if 1 // not yet wxMAC_USE_COCOA == 0
 
 MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding )
 {
@@ -67,7 +67,7 @@ MenuRef UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding
     MenuRef menu ;
 
     CreateNewMenu( id , 0 , &menu ) ;
-    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding ) ) ;
+    SetMenuTitleWithCFString( menu , wxCFStringRef(str , encoding ) ) ;
 
     return menu ;
 }
@@ -76,7 +76,7 @@ void UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding enco
 {
     wxString str = wxStripMenuCodes( title ) ;
 
-    SetMenuTitleWithCFString( menu , wxMacCFStringHolder(str , encoding) ) ;
+    SetMenuTitleWithCFString( menu , wxCFStringRef(str , encoding) ) ;
 }
 
 void UMASetMenuItemText( MenuRef menu,  MenuItemIndex item, const wxString& title, wxFontEncoding encoding )
@@ -84,7 +84,7 @@ void UMASetMenuItemText( MenuRef menu,  MenuItemIndex item, const wxString& titl
     // we don't strip the accels here anymore, must be done before
     wxString str = title ;
 
-    SetMenuItemTextWithCFString( menu , item , wxMacCFStringHolder(str , encoding) ) ;
+    SetMenuItemTextWithCFString( menu , item , wxCFStringRef(str , encoding) ) ;
 }
 
 void UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex inItem , bool enable)
@@ -273,7 +273,7 @@ void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding enc
 
 #endif
 
-#if wxMAC_USE_COCOA == 0
+#if 1 // not yet wxMAC_USE_COCOA == 0
 
 static OSStatus UMAGetHelpMenu(
                                MenuRef *        outHelpMenu,