cleanup and fix of double disposal (thanks to Steve Hartwell)

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

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index c48bf24a819278966f7f5c313f7f4f08a7d29ab7..6cc3aa1a791aed31425708df2f036b244f611a1b 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -130,7 +130,7 @@ void wxMenuItem::UpdateItemStatus()
         else
             ::SetItemMark( mhandle , index , 0 ) ; // no mark
 
         else
             ::SetItemMark( mhandle , index , 0 ) ; // no mark
 

-           UMASetMenuItemText( mhandle , index , m_text ) ; 
+           UMASetMenuItemText( mhandle , index , m_text , wxFont::GetDefaultEncoding() ) ; 

            wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
         UMASetMenuItemShortcut( mhandle , index , entry ) ;
         delete entry ;
            wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
         UMASetMenuItemShortcut( mhandle , index , entry ) ;
         delete entry ;


@@ -147,7 +147,7 @@ void wxMenuItem::UpdateItemText()
     if( mhandle == NULL || index == 0)
         return ;
 
     if( mhandle == NULL || index == 0)
         return ;
 

-       UMASetMenuItemText( mhandle , index , m_text ) ; 
+       UMASetMenuItemText( mhandle , index , m_text , wxFont::GetDefaultEncoding() ) ; 

        wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
     UMASetMenuItemShortcut( mhandle , index , entry ) ;
     delete entry ;
        wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ;
     UMASetMenuItemShortcut( mhandle , index , entry ) ;
     delete entry ;