A few tweaks and cleanups

[wxWidgets.git] / include / wx / mac / font.h

diff --git a/include/wx/mac/font.h b/include/wx/mac/font.h
index 6b41fc9c61545ea0594bc5a2085fa5219210262d..d9edd98f8e565013e90d0b8c961a5c185841cc1b 100644 (file)
--- a/include/wx/mac/font.h
+++ b/include/wx/mac/font.h
@@ -68,11 +68,12 @@ protected:
     bool          m_underlined;
     wxString      m_faceName;
     wxFontEncoding m_encoding;
     bool          m_underlined;
     wxString      m_faceName;
     wxFontEncoding m_encoding;

-
+    

 public :
        short           m_macFontNum ;
        short           m_macFontSize ;
 public :
        short           m_macFontNum ;
        short           m_macFontSize ;

-       Style           m_macFontStyle ;
+       unsigned char m_macFontStyle ;
+       wxUint32      m_macATSUFontID ;

 public :
        void            MacFindFont() ;
 };
 public :
        void            MacFindFont() ;
 };


@@ -100,6 +101,15 @@ public:
         (void)Create(size, family, style, weight, underlined, face, encoding);
     }
 
         (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,
     bool Create(int size,
                 int family,
                 int style,


@@ -108,6 +118,8 @@ public:
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 

+    bool Create(const wxNativeFontInfo& info);
+

     virtual ~wxFont();
 
     // assignment
     virtual ~wxFont();
 
     // assignment