X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69991fff84ddc964bb1ead757a0645bd64e60e7f..814af667d9f1e31d9f54759b4e406209b1a3250f:/src/mac/carbon/menuitem.cpp diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp index c48bf24a81..f3c4f869ee 100644 --- 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 - UMASetMenuItemText( mhandle , index , m_text ) ; + UMASetMenuItemText( mhandle , index , m_text , wxFont::GetDefaultEncoding() ) ; wxAcceleratorEntry *entry = wxGetAccelFromString( m_text ) ; UMASetMenuItemShortcut( mhandle , index , entry ) ; delete entry ; @@ -147,7 +147,7 @@ void wxMenuItem::UpdateItemText() 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 ; @@ -208,7 +208,7 @@ void wxMenuItem::Check(bool bDoCheck) } // also uncheck all the other items in this radio group - wxMenuItemList::Node *node = items.Item(start); + wxMenuItemList::compatibility_iterator node = items.Item(start); for ( int n = start; n <= end && node; n++ ) { if ( n != pos )