X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ebf2a1eccf40660111f35746acd1509b7bb11b70..d6906a06a24cf6dd081f1bc955c3255765a0b845:/include/wx/mac/carbon/font.h

diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h
index 9fc1171abb..9863e0325d 100644
--- a/include/wx/mac/carbon/font.h
+++ b/include/wx/mac/carbon/font.h
@@ -50,9 +50,11 @@ public:
 
     bool Create(const wxNativeFontInfo& info);
 
-    bool MacCreateThemeFont( wxUint16 themeFontID ) ;
-#ifdef __LP64__
-	bool MacCreateUIFont( wxUint32 coreTextFontType );
+    bool MacCreateFromThemeFont( wxUint16 themeFontID ) ;
+#if wxMAC_USE_CORE_TEXT
+	bool MacCreateFromUIFont( wxUint32 coreTextFontType );
+    bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 );
+    bool MacCreateFromCTFont( const void * ctFont );
 #endif
     
     virtual ~wxFont();
@@ -87,7 +89,7 @@ public:
 
     // 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;
@@ -99,10 +101,12 @@ public:
     wxUint16 MacGetThemeFontID() const ;
 
     // Returns an ATSUStyle not ATSUStyle*
-    void* MacGetATSUStyle() const ; 
-#else
+#endif
+#if wxMAC_USE_CORE_TEXT
     const void * MacGetCTFont() const;
-    // soon to be removed for 64bit, Returns an ATSUStyle not ATSUStyle*
+    const void * MacGetCTFontDescriptor() const;
+#endif
+#if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT
     void* MacGetATSUStyle() const ; 
 #endif