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

LP64 additions

Browse Source 
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:
Stefan Csomor
2007-05-15 20:47:56 +00:00
parent ad21891891
commit 49c8c6915a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/mac/carbon/font.h
View File

@@ -51,6 +51,9 @@ public:
bool Create(const wxNativeFontInfo& info); bool Create(const wxNativeFontInfo& info);
bool MacCreateThemeFont( wxUint16 themeFontID ) ; bool MacCreateThemeFont( wxUint16 themeFontID ) ;
#ifdef __LP64__
bool MacCreateUIFont( wxUint32 coreTextFontType );
#endif
virtual ~wxFont(); virtual ~wxFont();

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

@@ -303,7 +303,8 @@ void wxFontRefData::MacFindFont()
Boolean kTrue = true ; Boolean kTrue = true ;
Boolean kFalse = false ; Boolean kFalse = false ;
Fixed atsuSize = IntToFixed( m_macFontSize ); Fixed atsuSize = IntToFixed( m_pointSize );
short m_macATSUAdditionalQDStyles = 0;
ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal; ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal;
ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] = ATSUAttributeValuePtr atsuValues[sizeof(atsuTags) / sizeof(ATSUAttributeTag)] =
{ {
@@ -323,7 +324,6 @@ void wxFontRefData::MacFindFont()
atsuTags, atsuSizes, atsuValues); atsuTags, atsuSizes, atsuValues);
wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ); wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") );
#endif
#else #else
if ( m_macThemeFontID != kThemeCurrentPortFont ) if ( m_macThemeFontID != kThemeCurrentPortFont )
{ {