Fix some compilation and linking errors in samples.

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

diff --git a/include/wx/mac/font.h b/include/wx/mac/font.h
index e65149037e90a6ac88b85ed0d2402464ea824aa8..a49236c63623d250764b961caca26057f94de473 100644 (file)
--- a/include/wx/mac/font.h
+++ b/include/wx/mac/font.h
@@ -12,7 +12,7 @@
 #ifndef _WX_FONT_H_
 #define _WX_FONT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "font.h"
 #endif
 
@@ -21,20 +21,40 @@ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxFont;
 public:
     wxFontRefData()
+        : m_fontId(0)
+        , m_pointSize(10)
+        , m_family(wxDEFAULT)
+        , m_style(wxNORMAL)
+        , m_weight(wxNORMAL)
+        , m_underlined(FALSE)
+        , m_faceName(wxT("Geneva"))
+        , m_encoding(wxFONTENCODING_DEFAULT)
+        , m_macFontNum(0)
+        , m_macFontSize(0)
+        , m_macFontStyle(0)
+        , m_macATSUFontID()
     {
         Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
-             "Geneva", wxFONTENCODING_DEFAULT);
+             wxT("Geneva"), wxFONTENCODING_DEFAULT);
     }
 
     wxFontRefData(const wxFontRefData& data)
+        : wxGDIRefData()
+        , m_fontId(data.m_fontId)
+        , m_pointSize(data.m_pointSize)
+        , m_family(data.m_family)
+        , m_style(data.m_style)
+        , m_weight(data.m_weight)
+        , m_underlined(data.m_underlined)
+        , m_faceName(data.m_faceName)
+        , m_encoding(data.m_encoding)
+        , m_macFontNum(data.m_macFontNum)
+        , m_macFontSize(data.m_macFontSize)
+        , m_macFontStyle(data.m_macFontStyle)
+        , m_macATSUFontID(data.m_macATSUFontID)
     {
         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,
@@ -44,11 +64,26 @@ public:
                   bool underlined,
                   const wxString& faceName,
                   wxFontEncoding encoding)
+        : m_fontId(0)
+        , m_pointSize(size)
+        , m_family(family)
+        , m_style(style)
+        , m_weight(weight)
+        , m_underlined(underlined)
+        , m_faceName(faceName)
+        , m_encoding(encoding)
+        , m_macFontNum(0)
+        , m_macFontSize(0)
+        , m_macFontStyle(0)
+        , m_macATSUFontID(0)
     {
         Init(size, family, style, weight, underlined, faceName, encoding);
     }
 
     virtual ~wxFontRefData();
+    void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }
+    bool GetNoAntiAliasing() { return m_noAA; }
+    
 protected:
     // common part of all ctors
     void Init(int size,
@@ -60,21 +95,23 @@ protected:
               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;
+    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() ;
+    bool            m_noAA;      // No anti-aliasing
+    
+public:
+    short       m_macFontNum;
+    short       m_macFontSize;
+    unsigned char  m_macFontStyle;
+    wxUint32       m_macATSUFontID;
+public:
+    void        MacFindFont() ;
 };
 // ----------------------------------------------------------------------------
 // wxFont
@@ -85,7 +122,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,
@@ -146,6 +188,9 @@ public:
 
     virtual bool RealizeResource();
 
+    // Unofficial API, don't use
+    virtual void SetNoAntiAliasing( bool noAA = TRUE ) ;
+    virtual bool GetNoAntiAliasing() ;
 protected:
     // common part of all ctors
     void Init();