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

adding CoreText implementation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2007-11-29 21:36:30 +00:00
parent 937013e0fd
commit 16bdd5e4a3
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/mac/carbon/chkconf.h
View File

@@ -90,8 +90,8 @@
#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
#define wxMAC_USE_CORE_TEXT 1 #define wxMAC_USE_CORE_TEXT 0
#define wxMAC_USE_ATSU_TEXT 0 #define wxMAC_USE_ATSU_TEXT 1
#else // platform < 10.5 #else // platform < 10.5

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

@@ -51,7 +51,7 @@ public:
bool Create(const wxNativeFontInfo& info); bool Create(const wxNativeFontInfo& info);
bool MacCreateThemeFont( wxUint16 themeFontID ) ; bool MacCreateThemeFont( wxUint16 themeFontID ) ;
#ifdef __LP64__ #if wxMAC_USE_CORE_TEXT
bool MacCreateUIFont( wxUint32 coreTextFontType ); bool MacCreateUIFont( wxUint32 coreTextFontType );
#endif #endif
@@ -87,7 +87,7 @@ public:
// Mac-specific, risks to change, don't use in portable code // Mac-specific, risks to change, don't use in portable code
#ifndef __LP64__ #if wxMAC_USE_ATSU_TEXT
// 'old' Quickdraw accessors // 'old' Quickdraw accessors
short MacGetFontNum() const; short MacGetFontNum() const;
short MacGetFontSize() const; short MacGetFontSize() const;
@@ -100,10 +100,9 @@ public:
// Returns an ATSUStyle not ATSUStyle* // Returns an ATSUStyle not ATSUStyle*
void* MacGetATSUStyle() const ; void* MacGetATSUStyle() const ;
#else #endif
#if wxMAC_USE_CORE_TEXT
const void * MacGetCTFont() const; const void * MacGetCTFont() const;
// soon to be removed for 64bit, Returns an ATSUStyle not ATSUStyle*
void* MacGetATSUStyle() const ;
#endif #endif
private: private: