diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h index c252e01ee9..7762be7a90 100644 --- a/include/wx/mac/carbon/font.h +++ b/include/wx/mac/carbon/font.h @@ -51,6 +51,9 @@ public: bool Create(const wxNativeFontInfo& info); bool MacCreateThemeFont( wxUint16 themeFontID ) ; +#ifdef __LP64__ + bool MacCreateUIFont( wxUint32 coreTextFontType ); +#endif virtual ~wxFont(); diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp index 2d32cc3a06..5f177df82d 100644 --- a/src/mac/carbon/font.cpp +++ b/src/mac/carbon/font.cpp @@ -303,7 +303,8 @@ void wxFontRefData::MacFindFont() Boolean kTrue = true ; Boolean kFalse = false ; - Fixed atsuSize = IntToFixed( m_macFontSize ); + Fixed atsuSize = IntToFixed( m_pointSize ); + short m_macATSUAdditionalQDStyles = 0; ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal; ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = { @@ -323,7 +324,6 @@ void wxFontRefData::MacFindFont() atsuTags, atsuSizes, atsuValues); wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ); -#endif #else if ( m_macThemeFontID != kThemeCurrentPortFont ) {