Get/SetNoAntiAliasing implemented

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/font.h b/include/wx/mac/font.h
index b14155a75bfe099501c124509504c700bf5d2708..2c3c17e84e13e899f3fbf815903883e70e634364 100644 (file)
--- a/include/wx/mac/font.h
+++ b/include/wx/mac/font.h
@@ -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,6 +103,7 @@ 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:
     short         m_macFontNum;
     
 public:
     short         m_macFontNum;


@@ -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();

diff --git a/src/mac/carbon/font.cpp b/src/mac/carbon/font.cpp
index d1b4798cc40e0bf630f2eabf58f5409118611bc7..402293c36bc73e0a27bd9e30c97a8f07aabfa584 100644 (file)
--- a/src/mac/carbon/font.cpp
+++ b/src/mac/carbon/font.cpp
@@ -58,6 +58,7 @@ void wxFontRefData::Init(int pointSize,
     m_macFontSize = 0;
     m_macFontStyle = 0;
     m_fontId = 0;
     m_macFontSize = 0;
     m_macFontStyle = 0;
     m_fontId = 0;

+    m_noAA = FALSE;

 }
 
 wxFontRefData::~wxFontRefData()
 }
 
 wxFontRefData::~wxFontRefData()


@@ -258,6 +259,15 @@ void wxFont::SetUnderlined(bool underlined)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

+void wxFont::SetNoAntiAliasing( bool no )
+{
+    Unshare();
+
+    M_FONTDATA->SetNoAntiAliasing( no );
+
+    RealizeResource();
+}
+

 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------


@@ -300,3 +310,8 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->m_encoding;
 }
 
     return M_FONTDATA->m_encoding;
 }
 

+bool wxFont::GetNoAntiAliasing()
+{
+    return M_FONTDATA->m_noAA;
+}
+

diff --git a/src/mac/font.cpp b/src/mac/font.cpp
index d1b4798cc40e0bf630f2eabf58f5409118611bc7..402293c36bc73e0a27bd9e30c97a8f07aabfa584 100644 (file)
--- a/src/mac/font.cpp
+++ b/src/mac/font.cpp
@@ -58,6 +58,7 @@ void wxFontRefData::Init(int pointSize,
     m_macFontSize = 0;
     m_macFontStyle = 0;
     m_fontId = 0;
     m_macFontSize = 0;
     m_macFontStyle = 0;
     m_fontId = 0;

+    m_noAA = FALSE;

 }
 
 wxFontRefData::~wxFontRefData()
 }
 
 wxFontRefData::~wxFontRefData()


@@ -258,6 +259,15 @@ void wxFont::SetUnderlined(bool underlined)
     RealizeResource();
 }
 
     RealizeResource();
 }
 

+void wxFont::SetNoAntiAliasing( bool no )
+{
+    Unshare();
+
+    M_FONTDATA->SetNoAntiAliasing( no );
+
+    RealizeResource();
+}
+

 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // accessors
 // ----------------------------------------------------------------------------


@@ -300,3 +310,8 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->m_encoding;
 }
 
     return M_FONTDATA->m_encoding;
 }
 

+bool wxFont::GetNoAntiAliasing()
+{
+    return M_FONTDATA->m_noAA;
+}
+