X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f76c075805027058f08ffba0e8c1b32372f5fd44..be7e10393ae37a8b6395c50ac258c2c77c98c946:/include/wx/osx/font.h

diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h
index 79fb78b7c4..bcd86e775a 100644
--- a/include/wx/osx/font.h
+++ b/include/wx/osx/font.h
@@ -37,6 +37,10 @@ public:
     // ctors and such
     wxFont() { }
 
+#if wxOSX_USE_COCOA
+    wxFont(WX_NSFont nsfont);
+#endif
+
 #if FUTURE_WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
@@ -60,7 +64,7 @@ public:
     {
         Create(size, family, style, weight, underlined, face, encoding);
     }
-    
+
     wxFont(const wxSize& pixelSize,
            wxFontFamily family,
            wxFontStyle style,
@@ -72,7 +76,7 @@ public:
         Create(10, family, style, weight, underlined, face, encoding);
         SetPixelSize(pixelSize);
     }
-    
+
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
@@ -91,7 +95,7 @@ public:
     bool Create(const wxNativeFontInfo& info);
 
     bool CreateSystemFont(wxOSXSystemFont font);
-    
+
     virtual ~wxFont();
 
     // implement base class pure virtuals
@@ -120,10 +124,6 @@ public:
 
     virtual bool RealizeResource();
 
-    // Unofficial API, don't use
-    virtual void SetNoAntiAliasing( bool noAA = TRUE ) ;
-    virtual bool GetNoAntiAliasing() const  ;
-
     // Mac-specific, risks to change, don't use in portable code
 
 #if wxOSX_USE_CARBON && wxOSX_USE_ATSU_TEXT
@@ -157,6 +157,7 @@ public:
     WX_NSFont OSXGetNSFont() const;
     static WX_NSFont OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info);
     static WX_NSFont OSXCreateNSFont(const wxNativeFontInfo* info);
+    static void SetNativeInfoFromNSFont(WX_NSFont nsfont, wxNativeFontInfo* info);
 #endif
 
 #if wxOSX_USE_IPHONE