X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/584ad2a32fec156c6049145d7ece9a33213aea28..30bb5e18acd15fdab9ca70f600eee43771e28928:/src/mac/choice.cpp diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp index a18113dbf3..9f8494db9a 100644 --- a/src/mac/choice.cpp +++ b/src/mac/choice.cpp @@ -90,7 +90,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id, // ---------------------------------------------------------------------------- int wxChoice::DoAppend(const wxString& item) { - UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item); + UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() ); m_strings.Add( item ) ; m_datas.Add( NULL ) ; int index = m_strings.GetCount() - 1 ; @@ -107,7 +107,7 @@ int wxChoice::DoInsert(const wxString& item, int pos) if (pos == GetCount()) return DoAppend(item); - UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item); + UMAAppendMenuItem(MAC_WXHMENU( m_macPopUpMenuHandle ) , item, m_font.GetEncoding() ); m_strings.Insert( item, pos ) ; m_datas.Insert( NULL, pos ) ; DoSetItemClientData( pos , NULL ) ; @@ -277,7 +277,7 @@ wxSize wxChoice::DoGetBestSize() const #if wxUSE_UNICODE Point bounds={0,0} ; SInt16 baseline ; - ::GetThemeTextDimensions( wxMacCFStringHolder( str ) , + ::GetThemeTextDimensions( wxMacCFStringHolder( str , m_font.GetEncoding() ) , kThemeCurrentPortFont, kThemeStateActive, false,