X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f1c40652a0c2d6752c57df1b8aed22fae7e118dd..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/osx/font.h

diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h
index 25691b12a4..79fb78b7c4 100644
--- a/include/wx/osx/font.h
+++ b/include/wx/osx/font.h
@@ -113,7 +113,7 @@ public:
     virtual void SetUnderlined(bool underlined);
     virtual void SetEncoding(wxFontEncoding encoding);
 
-    WXDECLARE_COMPAT_SETTERS
+    wxDECLARE_COMMON_FONT_METHODS();
 
     // implementation only from now on
     // -------------------------------
@@ -128,36 +128,46 @@ public:
 
 #if wxOSX_USE_CARBON && wxOSX_USE_ATSU_TEXT
     wxUint16 MacGetThemeFontID() const ;
+
     // 'old' Quickdraw accessors
     short MacGetFontNum() const;
     wxByte  MacGetFontStyle() const;
 #endif
 
 #if wxOSX_USE_COCOA_OR_CARBON
-    CGFontRef GetCGFont() const;
+    CGFontRef OSXGetCGFont() const;
 #endif
 
 #if wxOSX_USE_CORE_TEXT
-    CTFontRef GetCTFont() const;
+    CTFontRef OSXGetCTFont() const;
 #endif
 
-#if wxOSX_USE_CORE_TEXT || wxOSX_USE_ATSU_TEXT
+#if wxOSX_USE_ATSU_TEXT
     // Returns an ATSUStyle not ATSUStyle*
     void* MacGetATSUStyle() const ;
+    void* OSXGetATSUStyle() const { return MacGetATSUStyle() ; }
+
+#if WXWIN_COMPATIBILITY_2_8
+    wxDEPRECATED( wxUint32 MacGetATSUFontID() const );
+    wxDEPRECATED( wxUint32 MacGetATSUAdditionalQDStyles() const );
+#endif
 #endif
 
 #if wxOSX_USE_COCOA
-    WX_NSFont GetNSFont() const;
-    static WX_NSFont CreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info);
-    static WX_NSFont CreateNSFont(const wxNativeFontInfo* info);
+    WX_NSFont OSXGetNSFont() const;
+    static WX_NSFont OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info);
+    static WX_NSFont OSXCreateNSFont(const wxNativeFontInfo* info);
 #endif
 
 #if wxOSX_USE_IPHONE
-    WX_UIFont GetUIFont() const;
-    static WX_NSFont CreateUIFont(wxOSXSystemFont font, wxNativeFontInfo* info);
+    WX_UIFont OSXGetUIFont() const;
+    static WX_UIFont OSXCreateUIFont(wxOSXSystemFont font, wxNativeFontInfo* info);
+    static WX_UIFont OSXCreateUIFont(const wxNativeFontInfo* info);
 #endif
 
 protected:
+    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
+
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;