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

OSX reshuffling

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-07-30 15:01:58 +00:00
parent fe1a36a70c
commit b46f221ff3
6 changed files with 39 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/osx/carbon/font.h
View File

@@ -51,7 +51,7 @@ public:
bool Create(const wxNativeFontInfo& info);
bool MacCreateFromThemeFont( wxUint16 themeFontID ) ;
#if wxMAC_USE_CORE_TEXT
#if wxOSX_USE_CORE_TEXT
bool MacCreateFromUIFont( wxUint32 coreTextFontType );
bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 );
bool MacCreateFromCTFont( const void * ctFont );
@@ -89,7 +89,7 @@ public:
// Mac-specific, risks to change, don't use in portable code
#if wxMAC_USE_ATSU_TEXT
#if wxOSX_USE_ATSU_TEXT
// 'old' Quickdraw accessors
short MacGetFontNum() const;
short MacGetFontSize() const;
@@ -102,11 +102,11 @@ public:
// Returns an ATSUStyle not ATSUStyle*
#endif
#if wxMAC_USE_CORE_TEXT
#if wxOSX_USE_CORE_TEXT
const void * MacGetCTFont() const;
const void * MacGetCTFontDescriptor() const;
#endif
#if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT
#if wxOSX_USE_CORE_TEXT || wxOSX_USE_ATSU_TEXT
void* MacGetATSUStyle() const ;
#endif