using newer API

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

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index dcb064398c89c4650c5b144b5a958f2bd46491d5..0f0fbdc08a360d22abb0e65c8d334fc0b2c4d17a 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -37,7 +37,7 @@ static int nextPopUpMenuId = 1000 ;
 
 MenuHandle NewUniqueMenu()
 {
-    MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ;
+    MenuHandle handle = UMANewMenu(nextPopUpMenuId, wxString(wxT("Menu")), wxFont::GetDefaultEncoding() );
     nextPopUpMenuId++ ;
 
     return handle ;

diff --git a/src/mac/carbon/taskbar.cpp b/src/mac/carbon/taskbar.cpp
index c8bb4e1f2632c4aeaf59b439b97b73be3f719c93..bce496ab28ca0531a4869b5b7d3ec7432cf0af49 100644 (file)
--- a/src/mac/carbon/taskbar.cpp
+++ b/src/mac/carbon/taskbar.cpp
@@ -235,7 +235,7 @@ pascal OSStatus wxDockEventHandler( EventHandlerCallRef inHandlerCallRef,
         // When SetEventParameter is called it will decrement
         // the reference count of the menu - we need to make
         // sure it stays around in the wxMenu class here
-        RetainMenu(hMenu);
+        CFRetain(hMenu);
 
         // set the actual dock menu
         err = SetEventParameter(