Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for crash when an invalid font was being mistakenly identified as valid due to a signed check on an unsigned value, and also change the wxLogDebug statement, as I was getting crashes with %s and wxString.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2007-02-22 01:53:23 +00:00
parent 7719a100f7
commit 5d2ad2f1db
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mac/carbon/font.cpp
View File

@@ -289,9 +289,12 @@ void wxFontRefData::MacFindFont()
{ {
wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() ); wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() );
ATSFontFamilyRef atsfamily = ATSFontFamilyFindFromName( cf , kATSOptionFlagsDefault ); ATSFontFamilyRef atsfamily = ATSFontFamilyFindFromName( cf , kATSOptionFlagsDefault );
if ( atsfamily == (ATSFontFamilyRef) -1 )
// ATSFontFamilyRef is an unsigned type, so check against max
// for an invalid value, not -1.
if ( atsfamily == 0xffffffff )
{ {
wxLogDebug( wxT("ATSFontFamilyFindFromName failed for %s"), m_faceName ); wxLogDebug( wxT("ATSFontFamilyFindFromName failed for ") + m_faceName );
m_macFontFamily = GetAppFont(); m_macFontFamily = GetAppFont();
} }
else else