]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix for crash when an invalid font was being mistakenly identified as valid due to...
authorKevin Ollivier <kevino@theolliviers.com>
Thu, 22 Feb 2007 01:53:23 +0000 (01:53 +0000)
committerKevin Ollivier <kevino@theolliviers.com>
Thu, 22 Feb 2007 01:53:23 +0000 (01:53 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/mac/carbon/font.cpp

index 98ce6d7bbdbe7bf40b395cd901abff6fe9855fed..3c63ecb23b8959a6df7a7339c1311b0b5208cf43 100644 (file)
@@ -289,9 +289,12 @@ void wxFontRefData::MacFindFont()
             {
                 wxMacCFStringHolder cf( m_faceName, wxLocale::GetSystemEncoding() );
                 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();
                 }
                 else