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 b14155a75bfe099501c124509504c700bf5d2708..a49236c63623d250764b961caca26057f94de473 100644 (file)
--- a/include/wx/mac/font.h
+++ b/include/wx/mac/font.h
@@ -27,7 +27,7 @@ public:
         , m_style(wxNORMAL)
         , m_weight(wxNORMAL)
         , m_underlined(FALSE)
         , m_style(wxNORMAL)
         , m_weight(wxNORMAL)
         , m_underlined(FALSE)

-        , m_faceName("Geneva")
+        , m_faceName(wxT("Geneva"))

         , m_encoding(wxFONTENCODING_DEFAULT)
         , m_macFontNum(0)
         , m_macFontSize(0)
         , m_encoding(wxFONTENCODING_DEFAULT)
         , m_macFontNum(0)
         , m_macFontSize(0)


@@ -35,7 +35,7 @@ public:
         , m_macATSUFontID()
     {
         Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,
         , m_macATSUFontID()
     {
         Init(10, wxDEFAULT, wxNORMAL, wxNORMAL, FALSE,

-             "Geneva", wxFONTENCODING_DEFAULT);
+             wxT("Geneva"), wxFONTENCODING_DEFAULT);

     }
 
     wxFontRefData(const wxFontRefData& data)
     }
 
     wxFontRefData(const wxFontRefData& data)


@@ -81,6 +81,9 @@ public:
     }
 
     virtual ~wxFontRefData();
     }
 
     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,
 protected:
     // common part of all ctors
     void Init(int size,


@@ -100,14 +103,15 @@ protected:
     bool           m_underlined;
     wxString       m_faceName;
     wxFontEncoding m_encoding;
     bool           m_underlined;
     wxString       m_faceName;
     wxFontEncoding m_encoding;

+    bool            m_noAA;      // No anti-aliasing

     
 public:
     
 public:

-    short         m_macFontNum;
-    short         m_macFontSize;
+    short       m_macFontNum;
+    short       m_macFontSize;

     unsigned char  m_macFontStyle;
     wxUint32       m_macATSUFontID;
 public:
     unsigned char  m_macFontStyle;
     wxUint32       m_macATSUFontID;
 public:

-    void               MacFindFont() ;
+    void        MacFindFont() ;

 };
 // ----------------------------------------------------------------------------
 // wxFont
 };
 // ----------------------------------------------------------------------------
 // wxFont


@@ -184,6 +188,9 @@ public:
 
     virtual bool RealizeResource();
 
 
     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();
 protected:
     // common part of all ctors
     void Init();