LP64 additions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -51,6 +51,9 @@ public:
|
||||
bool Create(const wxNativeFontInfo& info);
|
||||
|
||||
bool MacCreateThemeFont( wxUint16 themeFontID ) ;
|
||||
#ifdef __LP64__
|
||||
bool MacCreateUIFont( wxUint32 coreTextFontType );
|
||||
#endif
|
||||
|
||||
virtual ~wxFont();
|
||||
|
||||
|
@@ -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 )
|
||||
{
|
||||
|
Reference in New Issue
Block a user