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