]> git.saurik.com Git - wxWidgets.git/commitdiff
Use correct format specifiers in wxOSX/Carbon font caching code.
authorVadim Zeitlin <vadim@wxwidgets.org>
Wed, 14 Jul 2010 14:52:23 +0000 (14:52 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Wed, 14 Jul 2010 14:52:23 +0000 (14:52 +0000)
The specifiers used didn't match the actual argument types resulting in the
asserts from the new wxPrintf() code. Correct them to match the real types.

Closes #12186.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/osx/carbon/font.cpp

index dd3d6d42227e34a5f839a0a0083655cad15ca418..2d0ae842e25fdbe33bfff63fb61313d2a423eb4f 100644 (file)
@@ -477,7 +477,7 @@ void wxFontRefData::MacFindFont()
             traits |= kCTFontItalicTrait;
 
         // use font caching
-        wxString lookupnameWithSize = wxString::Format( "%s_%ld_%ld", m_info.m_faceName.c_str(), traits, m_info.m_pointSize );
+        wxString lookupnameWithSize = wxString::Format( "%s_%u_%d", m_info.m_faceName, traits, m_info.m_pointSize );
 
         static std::map< std::wstring , wxCFRef< CTFontRef > > fontcache ;
         m_ctFont = fontcache[ std::wstring(lookupnameWithSize.wc_str()) ];