X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99c13b276ae030a6e42097af517ad36ac7cbb648..3570a1c6e596c358848c77c5b37d724097340ce8:/src/mac/carbon/font.cpp diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp index 5b7f7d684e..e5ebd6dc39 100644 --- a/src/mac/carbon/font.cpp +++ b/src/mac/carbon/font.cpp @@ -31,6 +31,7 @@ #endif #include +#include IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject) @@ -413,7 +414,7 @@ void wxFontRefData::MacFindFont() // use font descriptor caching #if 1 - wxString lookupname = wxString::Format( "%s_%ld", m_faceName, traits ); + wxString lookupname = wxString::Format( "%s_%ld", m_faceName.c_str(), traits ); static std::map< std::wstring , wxCFRef< CTFontDescriptorRef > > fontdescriptorcache ; @@ -431,7 +432,7 @@ void wxFontRefData::MacFindFont() // use font caching #if 1 - wxString lookupnameWithSize = wxString::Format( "%s_%ld_%ld", m_faceName, traits, m_pointSize ); + wxString lookupnameWithSize = wxString::Format( "%s_%ld_%ld", m_faceName.c_str(), traits, m_pointSize ); static std::map< std::wstring , wxCFRef< CTFontRef > > fontcache ; m_ctFont = fontcache[ std::wstring(lookupnameWithSize.wc_str()) ];