Fix button order in wxGTK wxMessageDialog and wxStdDialogButtonSizer.

[wxWidgets.git] / src / gtk / font.cpp

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 7c678b3fb67e7bb3cde17a7edbd9a00f434cf4c3..adeb1354f7097ff5e0d421a5f40bf674fcb6de58 100644 (file)
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -73,9 +73,6 @@ public:
     bool SetFaceName(const wxString& facename);
     void SetEncoding(wxFontEncoding encoding);
 
-    void SetNoAntiAliasing( bool no = true ) { m_noAA = no; }
-    bool GetNoAntiAliasing() const { return m_noAA; }
-
     // and this one also modifies all the other font data fields
     void SetNativeFontInfo(const wxNativeFontInfo& info);
 
@@ -93,9 +90,7 @@ protected:
     void InitFromNative();
 
 private:
-    wxFontEncoding  m_encoding;
     bool            m_underlined;
-    bool            m_noAA;      // No anti-aliasing
 
     // The native font info: basically a PangoFontDescription
     wxNativeFontInfo m_nativeFontInfo;
@@ -115,17 +110,12 @@ void wxFontRefData::Init(int pointSize,
                          wxFontWeight weight,
                          bool underlined,
                          const wxString& faceName,
-                         wxFontEncoding encoding)
+                         wxFontEncoding WXUNUSED(encoding))
 {
     if (family == wxFONTFAMILY_DEFAULT)
         family = wxFONTFAMILY_SWISS;
 
     m_underlined = underlined;
-    m_encoding = encoding;
-    if ( m_encoding == wxFONTENCODING_DEFAULT )
-        m_encoding = wxFont::GetDefaultEncoding();
-
-    m_noAA = false;
 
     // Create native font info
     m_nativeFontInfo.description = pango_font_description_new();
@@ -133,7 +123,7 @@ void wxFontRefData::Init(int pointSize,
     // And set its values
     if (!faceName.empty())
     {
-       pango_font_description_set_family( m_nativeFontInfo.description,
+        pango_font_description_set_family( m_nativeFontInfo.description,
                                            wxGTK_CONV_SYS(faceName) );
     }
     else
@@ -150,8 +140,6 @@ void wxFontRefData::Init(int pointSize,
 
 void wxFontRefData::InitFromNative()
 {
-    m_noAA = false;
-
     // Get native info
     PangoFontDescription *desc = m_nativeFontInfo.description;
 
@@ -162,17 +150,12 @@ void wxFontRefData::InitFromNative()
 
     // Pango description are never underlined
     m_underlined = false;
-
-    // always with GTK+ 2
-    m_encoding = wxFONTENCODING_UTF8;
 }
 
 wxFontRefData::wxFontRefData( const wxFontRefData& data )
              : wxGDIRefData()
 {
     m_underlined = data.m_underlined;
-    m_encoding = data.m_encoding;
-    m_noAA = data.m_noAA;
 
     // Forces a copy of the internal data.  wxNativeFontInfo should probably
     // have a copy ctor and assignment operator to fix this properly but that
@@ -230,7 +213,7 @@ bool wxFontRefData::SetPixelSize(const wxSize& pixelSize)
         return false;
     }
 
-    pango_font_description_set_absolute_size( m_nativeFontInfo.description, 
+    pango_font_description_set_absolute_size( m_nativeFontInfo.description,
                                               pixelSize.GetHeight() * PANGO_SCALE );
 
     return true;
@@ -267,13 +250,9 @@ bool wxFontRefData::SetFaceName(const wxString& facename)
     return m_nativeFontInfo.SetFaceName(facename);
 }
 
-void wxFontRefData::SetEncoding(wxFontEncoding encoding)
+void wxFontRefData::SetEncoding(wxFontEncoding WXUNUSED(encoding))
 {
-    m_encoding = encoding;
-
-    // the internal Pango encoding is always UTF8; here we save the
-    // encoding just to make it possible to return it from GetEncoding()
-    // FIXME: this seems wrong; shouldn't GetEncoding() always return wxFONTENCODING_UTF8?
+    // with GTK+ 2 Pango always uses UTF8 internally, we cannot change it
 }
 
 void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
@@ -354,10 +333,8 @@ wxString wxFont::GetFaceName() const
     return M_FONTDATA->m_nativeFontInfo.GetFaceName();
 }
 
-wxFontFamily wxFont::GetFamily() const
+wxFontFamily wxFont::DoGetFamily() const
 {
-    wxCHECK_MSG( IsOk(), wxFONTFAMILY_MAX, wxT("invalid font") );
-
     return M_FONTDATA->m_nativeFontInfo.GetFamily();
 }
 
@@ -386,14 +363,8 @@ wxFontEncoding wxFont::GetEncoding() const
 {
     wxCHECK_MSG( IsOk(), wxFONTENCODING_SYSTEM, wxT("invalid font") );
 
-    return M_FONTDATA->m_encoding;
-}
-
-bool wxFont::GetNoAntiAliasing() const
-{
-    wxCHECK_MSG( IsOk(), false, wxT("invalid font") );
-
-    return M_FONTDATA->m_noAA;
+    return wxFONTENCODING_UTF8;
+        // Pango always uses UTF8... see also SetEncoding()
 }
 
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
@@ -471,13 +442,6 @@ void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
     M_FONTDATA->SetNativeFontInfo( info );
 }
 
-void wxFont::SetNoAntiAliasing( bool no )
-{
-    AllocExclusive();
-
-    M_FONTDATA->SetNoAntiAliasing( no );
-}
-
 wxGDIRefData* wxFont::CreateGDIRefData() const
 {
     return new wxFontRefData;