adding CoreText implementation

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/chkconf.h b/include/wx/mac/carbon/chkconf.h
index ac2332341e1a1b493621ed23b28690a6be281a39..a60e0229005ab5bf204d0f9430fa7091a11af31c 100644 (file)
--- a/include/wx/mac/carbon/chkconf.h
+++ b/include/wx/mac/carbon/chkconf.h
@@ -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_ATSU_TEXT 0
+#define wxMAC_USE_CORE_TEXT 0
+#define wxMAC_USE_ATSU_TEXT 1

 
 #else // platform < 10.5
 
 
 #else // platform < 10.5
 

diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h
index 9fc1171abbde4bbe91779e588d559912d6a3f9fa..891e32b6eed657d226d636ff6dde84ba231e0c60 100644 (file)
--- a/include/wx/mac/carbon/font.h
+++ b/include/wx/mac/carbon/font.h
@@ -51,7 +51,7 @@ public:
     bool Create(const wxNativeFontInfo& info);
 
     bool MacCreateThemeFont( wxUint16 themeFontID ) ;
     bool Create(const wxNativeFontInfo& info);
 
     bool MacCreateThemeFont( wxUint16 themeFontID ) ;

-#ifdef __LP64__
+#if wxMAC_USE_CORE_TEXT

        bool MacCreateUIFont( wxUint32 coreTextFontType );
 #endif
     
        bool MacCreateUIFont( wxUint32 coreTextFontType );
 #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
     short MacGetFontNum() const;
     short MacGetFontSize() const;
     // 'old' Quickdraw accessors
     short MacGetFontNum() const;
     short MacGetFontSize() const;


@@ -100,10 +100,9 @@ public:
 
     // Returns an ATSUStyle not ATSUStyle*
     void* MacGetATSUStyle() const ; 
 
     // Returns an ATSUStyle not ATSUStyle*
     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
     
 private:
 #endif
     
 private: