Reverted part of patch #876969 ("Fixes to Borland warnings"), resulted in bugs when...

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

diff --git a/include/wx/mac/font.h b/include/wx/mac/font.h
index 1dd3f3da7c553fd98cda58855f558d9499f88044..78aa2f4d5f2f44eac7f0f700f60afa261a1da758 100644 (file)
--- a/include/wx/mac/font.h
+++ b/include/wx/mac/font.h
@@ -12,70 +12,10 @@
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "font.h"
 #endif
 
-class WXDLLEXPORT wxFontRefData: public wxGDIRefData
-{
-    friend class WXDLLEXPORT wxFont;
-public:
-    wxFontRefData()
-    {
-        Init(12, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
-             "", wxFONTENCODING_DEFAULT);
-    }
-
-    wxFontRefData(const wxFontRefData& data)
-    {
-        Init(data.m_pointSize, data.m_family, data.m_style, data.m_weight,
-             data.m_underlined, data.m_faceName, data.m_encoding);
-
-               m_macFontNum = data.m_macFontNum ;
-               m_macFontSize = data.m_macFontSize;
-               m_macFontStyle = data.m_macFontStyle;
-               m_fontId = data.m_fontId;
-    }
-
-    wxFontRefData(int size,
-                  int family,
-                  int style,
-                  int weight,
-                  bool underlined,
-                  const wxString& faceName,
-                  wxFontEncoding encoding)
-    {
-        Init(size, family, style, weight, underlined, faceName, encoding);
-    }
-
-    virtual ~wxFontRefData();
-protected:
-    // common part of all ctors
-    void Init(int size,
-              int family,
-              int style,
-              int weight,
-              bool underlined,
-              const wxString& faceName,
-              wxFontEncoding encoding);
-
-    // font characterstics
-    int           m_fontId;
-    int           m_pointSize;
-    int           m_family;
-    int           m_style;
-    int           m_weight;
-    bool          m_underlined;
-    wxString      m_faceName;
-    wxFontEncoding m_encoding;
-
-public :
-       short           m_macFontNum ;
-       short           m_macFontSize ;
-       Style           m_macFontStyle ;
-public :
-       void            MacFindFont() ;
-};
 // ----------------------------------------------------------------------------
 // wxFont
 // ----------------------------------------------------------------------------
@@ -85,7 +25,12 @@ class WXDLLEXPORT wxFont : public wxFontBase
 public:
     // ctors and such
     wxFont() { Init(); }
-    wxFont(const wxFont& font) { Init(); Ref(font); }
+    wxFont(const wxFont& font)
+        : wxFontBase()
+    {
+        Init();
+        Ref(font);
+    }
 
     wxFont(int size,
            int family,
@@ -100,6 +45,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 +62,8 @@ public:
                 const wxString& face = wxEmptyString,
                 wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
+    bool Create(const wxNativeFontInfo& info);
+
     virtual ~wxFont();
 
     // assignment
@@ -121,6 +77,7 @@ public:
     virtual bool GetUnderlined() const;
     virtual wxString GetFaceName() const;
     virtual wxFontEncoding GetEncoding() const;
+    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
 
     virtual void SetPointSize(int pointSize);
     virtual void SetFamily(int family);
@@ -133,16 +90,17 @@ public:
     // implementation only from now on
     // -------------------------------
 
-    int GetFontId() const;
-    virtual bool IsFree() const;
     virtual bool RealizeResource();
-    virtual WXHANDLE GetResourceHandle();
-    virtual bool FreeResource(bool force = FALSE);
-    void MacInstall() const ;
-    /*
-       virtual bool UseResource();
-       virtual bool ReleaseResource();
-     */
+
+    // Unofficial API, don't use
+    virtual void SetNoAntiAliasing( bool noAA = TRUE ) ;
+    virtual bool GetNoAntiAliasing() ;
+
+    // Mac-specific, risks to change, don't use in portable code
+    short GetMacFontNum() const;
+    short GetMacFontSize() const;
+    wxByte  GetMacFontStyle() const;
+    wxUint32 GetMacATSUFontID() const;
 
 protected:
     // common part of all ctors