X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51abe921b849be69f02c174365c9a7bc8b46bd08..59840ba3b16e4baf3228dd79c6b7ae40b55cf488:/include/wx/mac/font.h?ds=sidebyside

diff --git a/include/wx/mac/font.h b/include/wx/mac/font.h
index fb985307b7..d9edd98f8e 100644
--- a/include/wx/mac/font.h
+++ b/include/wx/mac/font.h
@@ -22,8 +22,8 @@ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
 public:
     wxFontRefData()
     {
-        Init(12, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
-             "", wxFONTENCODING_DEFAULT);
+        Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
+             "Geneva", wxFONTENCODING_DEFAULT);
     }
 
     wxFontRefData(const wxFontRefData& data)
@@ -68,11 +68,12 @@ protected:
     bool          m_underlined;
     wxString      m_faceName;
     wxFontEncoding m_encoding;
-
+    
 public :
 	short		m_macFontNum ;
 	short		m_macFontSize ;
-	Style		m_macFontStyle ;
+	unsigned char m_macFontStyle ;
+	wxUint32      m_macATSUFontID ;
 public :
 	void		MacFindFont() ;
 };
@@ -100,6 +101,15 @@ public:
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
+    wxFont(const wxNativeFontInfo& info)
+    {
+        Init();
+
+        (void)Create(info);
+    }
+
+    wxFont(const wxString& fontDesc);
+
     bool Create(int size,
                 int family,
                 int style,
@@ -108,6 +118,8 @@ public:
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
+    bool Create(const wxNativeFontInfo& info);
+
     virtual ~wxFont();
 
     // assignment