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

Applied #8697 (Improve error detection for MacFindFont )

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@62122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2009-09-25 13:13:59 +00:00
parent b04369c5e9
commit 8e12cd29d0
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,6 +226,8 @@ void wxFontRefData::MacFindFont()
OSStatus status = noErr; OSStatus status = noErr;
Str255 qdFontName ; Str255 qdFontName ;
wxCHECK_RET( m_pointSize > 0, wxT("Point size should not be zero.") );
#ifdef __LP64__ #ifdef __LP64__
if ( m_faceName.empty() && m_family == wxDEFAULT ) if ( m_faceName.empty() && m_family == wxDEFAULT )
{ {
@@ -330,8 +332,7 @@ void wxFontRefData::MacFindFont()
}; };
status = ::ATSUSetAttributes( (ATSUStyle)m_macATSUStyle, attributeCount, atsuTags, atsuSizes, atsuValues); status = ::ATSUSetAttributes( (ATSUStyle)m_macATSUStyle, attributeCount, atsuTags, atsuSizes, atsuValues);
wxASSERT_MSG( status == noErr , wxString::Format(wxT("couldn't modify ATSU style. Status was %d"), (int) status).c_str() );
wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") );
#else #else
if ( m_macThemeFontID != kThemeCurrentPortFont ) if ( m_macThemeFontID != kThemeCurrentPortFont )
{ {