From 9a62fa17b1c342b5b1e1bb9b96373e170a9d8b6f Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Thu, 10 Aug 2006 05:31:13 +0000 Subject: [PATCH] using newer API git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/combobox.cpp | 2 +- src/mac/carbon/taskbar.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index dcb064398c..0f0fbdc08a 100644 --- 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 c8bb4e1f26..bce496ab28 100644 --- 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( -- 2.45.2