X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16bdd5e4a3d97c8cd72e55749aee946cda281cef..51cd351973a7070f5827c65ec47eeb546451c3f1:/include/wx/mac/carbon/font.h

diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h
index 891e32b6ee..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 ) ;
+    bool MacCreateFromThemeFont( wxUint16 themeFontID ) ;
 #if wxMAC_USE_CORE_TEXT
-	bool MacCreateUIFont( wxUint32 coreTextFontType );
+	bool MacCreateFromUIFont( wxUint32 coreTextFontType );
+    bool MacCreateFromCTFontDescriptor( const void * ctFontDescriptor, int pointSize = 0 );
+    bool MacCreateFromCTFont( const void * ctFont );
 #endif
     
     virtual ~wxFont();
@@ -99,10 +101,13 @@ public:
     wxUint16 MacGetThemeFontID() const ;
 
     // Returns an ATSUStyle not ATSUStyle*
-    void* MacGetATSUStyle() const ; 
 #endif
 #if wxMAC_USE_CORE_TEXT
     const void * MacGetCTFont() const;
+    const void * MacGetCTFontDescriptor() const;
+#endif
+#if wxMAC_USE_CORE_TEXT || wxMAC_USE_ATSU_TEXT
+    void* MacGetATSUStyle() const ; 
 #endif
     
 private: