X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/937013e0fd914d4c42f9f5ec98da665986b93dfa..8064223b7b1b3657363b7a635c381b9269d95e55:/src/mac/carbon/combobxc.cpp diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp index 6bb1dd4b48..c494f9fada 100644 --- a/src/mac/carbon/combobxc.cpp +++ b/src/mac/carbon/combobxc.cpp @@ -422,7 +422,7 @@ wxString wxComboBox::GetValue() const #if USE_HICOMBOBOX CFStringRef myString; HIComboBoxCopyTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)GetSelection(), &myString ); - return wxMacCFStringHolder( myString, m_font.GetEncoding() ).AsString(); + return wxMacCFStringHolder( myString, GetFont().GetEncoding() ).AsString(); #else wxString result; @@ -547,7 +547,7 @@ int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items, HIComboBoxInsertTextItemAtIndex(m_peer->GetControlRef(), (CFIndex)pos, wxMacCFStringHolder(items[i], - m_font.GetEncoding())); + GetFont().GetEncoding())); AssignNewItemClientData(pos, clientData, i, type); } @@ -670,7 +670,7 @@ void wxComboBox::SetString(unsigned int n, const wxString& s) { #if USE_HICOMBOBOX verify_noerr ( HIComboBoxInsertTextItemAtIndex( m_peer->GetControlRef(), (CFIndex) n, - wxMacCFStringHolder(s, m_font.GetEncoding()) ) ); + wxMacCFStringHolder(s, GetFont().GetEncoding()) ) ); verify_noerr ( HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), (CFIndex) n + 1 ) ); #else m_choice->SetString( n , s );