X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8462a84b2caab30265823ebbdbdfc7cff91486e6..f5fac4471b361f54ae6a09f6047ae4dbe30fcb86:/include/wx/osx/font.h?ds=inline

diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h
index 625a079c0b..fb7fea783a 100644
--- a/include/wx/osx/font.h
+++ b/include/wx/osx/font.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        font.h
+// Name:        wx/osx/font.h
 // Purpose:     wxFont class
 // Author:      Julian Smart
 // Modified by:
@@ -37,6 +37,12 @@ public:
     // ctors and such
     wxFont() { }
 
+    wxFont( wxOSXSystemFont systemFont );
+
+#if wxOSX_USE_COCOA
+    wxFont(WX_NSFont nsfont);
+#endif
+
 #if FUTURE_WXWIN_COMPATIBILITY_3_0
     wxFont(int size,
            int family,
@@ -73,6 +79,19 @@ public:
         SetPixelSize(pixelSize);
     }
 
+    wxFont(int pointSize,
+           wxFontFamily family,
+           int flags = wxFONTFLAG_DEFAULT,
+           const wxString& face = wxEmptyString,
+           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
+    {
+        Create(pointSize, family,
+               GetStyleFromFlags(flags),
+               GetWeightFromFlags(flags),
+               GetUnderlinedFromFlags(flags),
+               face, encoding);
+    }
+
     bool Create(int size,
                 wxFontFamily family,
                 wxFontStyle style,
@@ -90,14 +109,11 @@ public:
 
     bool Create(const wxNativeFontInfo& info);
 
-    bool CreateSystemFont(wxOSXSystemFont font);
-
     virtual ~wxFont();
 
     // implement base class pure virtuals
     virtual int GetPointSize() const;
     virtual wxSize GetPixelSize() const;
-    virtual wxFontFamily GetFamily() const;
     virtual wxFontStyle GetStyle() const;
     virtual wxFontWeight GetWeight() const;
     virtual bool GetUnderlined() const;
@@ -143,16 +159,15 @@ public:
     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 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
@@ -163,6 +178,7 @@ public:
 
 protected:
     virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
+    virtual wxFontFamily DoGetFamily() const;
 
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;