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

diff --git a/include/wx/mac/carbon/font.h b/include/wx/mac/carbon/font.h
index 891e32b6ee..3962e4b287 100644
--- a/include/wx/mac/carbon/font.h
+++ b/include/wx/mac/carbon/font.h
@@ -16,7 +16,7 @@
 // wxFont
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxFont : public wxFontBase
+class WXDLLIMPEXP_CORE wxFont : public wxFontBase
 {
 public:
     // ctors and such
@@ -50,11 +50,13 @@ 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();
 
     // implement base class pure virtuals
@@ -86,30 +88,36 @@ public:
     virtual bool GetNoAntiAliasing() const  ;
 
     // Mac-specific, risks to change, don't use in portable code
-    
+
 #if wxMAC_USE_ATSU_TEXT
     // 'old' Quickdraw accessors
     short MacGetFontNum() const;
     short MacGetFontSize() const;
     wxByte  MacGetFontStyle() const;
-    
+
     // 'new' ATSUI accessors
     wxUint32 MacGetATSUFontID() const;
     wxUint32 MacGetATSUAdditionalQDStyles() const;
     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
-    
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
 private:
     void Unshare();
 
     DECLARE_DYNAMIC_CLASS(wxFont)
 };
 
-#endif
-    // _WX_FONT_H_
+#endif // _WX_FONT_H_