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

changing asserts to debug info

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-01-26 17:36:53 +00:00
parent b5d59f11f0
commit dedf5d9f66
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,6 +263,11 @@ void wxFontRefData::MacFindFont()
#ifndef __LP64__ #ifndef __LP64__
wxMacStringToPascal( m_faceName , qdFontName ); wxMacStringToPascal( m_faceName , qdFontName );
m_macFontFamily = FMGetFontFamilyFromName( qdFontName ); m_macFontFamily = FMGetFontFamilyFromName( qdFontName );
if ( m_macFontFamily == kInvalidFontFamily )
{
wxLogDebug( wxT("ATSFontFamilyFindFromName failed for %s"), m_faceName );
m_macFontFamily = GetAppFont();
}
#endif #endif
} }
} }
@@ -283,8 +288,13 @@ 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 );
wxASSERT_MSG( atsfamily != (ATSFontFamilyRef) -1 , wxT("ATSFontFamilyFindFromName failed") ); if ( atsfamily == (ATSFontFamilyRef) -1 )
m_macFontFamily = FMGetFontFamilyFromATSFontFamilyRef( atsfamily ); {
wxLogDebug( wxT("ATSFontFamilyFindFromName failed for %s"), m_faceName );
m_macFontFamily = GetAppFont();
}
else
m_macFontFamily = FMGetFontFamilyFromATSFontFamilyRef( atsfamily );
} }
} }