Preserve wxSlider value when changing its range in wxOSX too.

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

diff --git a/src/x11/font.cpp b/src/x11/font.cpp
index 7e3ec5f6dcf4f1b2ac0ce5040210fbcd5eb3d9a5..6423e578ea9a54b78b13cba7b0765210f12f26e0 100644 (file)
--- a/src/x11/font.cpp
+++ b/src/x11/font.cpp
@@ -125,9 +125,6 @@ public:
     bool SetFaceName(const wxString& facename);
     void SetEncoding(wxFontEncoding encoding);
 
     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);
 
     // and this one also modifies all the other font data fields
     void SetNativeFontInfo(const wxNativeFontInfo& info);
 


@@ -152,7 +149,6 @@ protected:
     bool          m_underlined;
     wxString      m_faceName;
     wxFontEncoding m_encoding;   // Unused in Unicode mode
     bool          m_underlined;
     wxString      m_faceName;
     wxFontEncoding m_encoding;   // Unused in Unicode mode

-    bool            m_noAA;      // No anti-aliasing

 
     wxNativeFontInfo m_nativeFontInfo;
 
 
     wxNativeFontInfo m_nativeFontInfo;
 


@@ -232,8 +228,6 @@ void wxFontRefData::Init(int pointSize,
 
 void wxFontRefData::InitFromNative()
 {
 
 void wxFontRefData::InitFromNative()
 {

-    m_noAA = false;
-

 #if wxUSE_UNICODE
     // Get native info
     PangoFontDescription *desc = m_nativeFontInfo.description;
 #if wxUSE_UNICODE
     // Get native info
     PangoFontDescription *desc = m_nativeFontInfo.description;


@@ -267,7 +261,7 @@ void wxFontRefData::InitFromNative()
             break;
 
         default:
             break;
 
         default:

-            wxFAIL_MSG(_T("unknown Pango font weight"));
+            wxFAIL_MSG(wxT("unknown Pango font weight"));

             // fall through
 
         case PANGO_WEIGHT_NORMAL:
             // fall through
 
         case PANGO_WEIGHT_NORMAL:


@@ -309,30 +303,30 @@ void wxFontRefData::InitFromNative()
     m_weight = wxFONTWEIGHT_NORMAL;
 
     wxString w = m_nativeFontInfo.GetXFontComponent(wxXLFD_WEIGHT).Upper();
     m_weight = wxFONTWEIGHT_NORMAL;
 
     wxString w = m_nativeFontInfo.GetXFontComponent(wxXLFD_WEIGHT).Upper();

-    if ( !w.empty() && w != _T('*') )
+    if ( !w.empty() && w != wxT('*') )

     {
         // the test below catches all of BOLD, EXTRABOLD, DEMIBOLD, ULTRABOLD
         // and BLACK
     {
         // the test below catches all of BOLD, EXTRABOLD, DEMIBOLD, ULTRABOLD
         // and BLACK

-        if ( ((w[0u] == _T('B') && (!wxStrcmp(w.c_str() + 1, wxT("OLD")) ||
+        if ( ((w[0u] == wxT('B') && (!wxStrcmp(w.c_str() + 1, wxT("OLD")) ||

                                    !wxStrcmp(w.c_str() + 1, wxT("LACK"))))) ||
                                    !wxStrcmp(w.c_str() + 1, wxT("LACK"))))) ||

-             wxStrstr(w.c_str() + 1, _T("BOLD")) )
+             wxStrstr(w.c_str() + 1, wxT("BOLD")) )

         {
             m_weight = wxFONTWEIGHT_BOLD;
         }
         {
             m_weight = wxFONTWEIGHT_BOLD;
         }

-        else if ( w == _T("LIGHT") || w == _T("THIN") )
+        else if ( w == wxT("LIGHT") || w == wxT("THIN") )

         {
             m_weight = wxFONTWEIGHT_LIGHT;
         }
     }
 
     switch ( wxToupper( m_nativeFontInfo.
         {
             m_weight = wxFONTWEIGHT_LIGHT;
         }
     }
 
     switch ( wxToupper( m_nativeFontInfo.

-                       GetXFontComponent(wxXLFD_SLANT)[0u]).GetValue() )
+                GetXFontComponent(wxXLFD_SLANT)[0u]).GetValue() )

     {
     {

-        case _T('I'):   // italique
+        case wxT('I'):   // italique

             m_style = wxFONTSTYLE_ITALIC;
             break;
 
             m_style = wxFONTSTYLE_ITALIC;
             break;
 

-        case _T('O'):   // oblique
+        case wxT('O'):   // oblique

             m_style = wxFONTSTYLE_SLANT;
             break;
 
             m_style = wxFONTSTYLE_SLANT;
             break;
 


@@ -354,7 +348,7 @@ void wxFontRefData::InitFromNative()
     // examine the spacing: if the font is monospaced, assume wxTELETYPE
     // family for compatibility with the old code which used it instead of
     // IsFixedWidth()
     // examine the spacing: if the font is monospaced, assume wxTELETYPE
     // family for compatibility with the old code which used it instead of
     // IsFixedWidth()

-    if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING).Upper() == _T('M') )
+    if ( m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING).Upper() == wxT('M') )

     {
         m_family = wxFONTFAMILY_TELETYPE;
     }
     {
         m_family = wxFONTFAMILY_TELETYPE;
     }


@@ -373,7 +367,7 @@ void wxFontRefData::InitFromNative()
         registry = m_nativeFontInfo.GetXFontComponent(wxXLFD_REGISTRY).Upper(),
         encoding = m_nativeFontInfo.GetXFontComponent(wxXLFD_ENCODING).Upper();
 
         registry = m_nativeFontInfo.GetXFontComponent(wxXLFD_REGISTRY).Upper(),
         encoding = m_nativeFontInfo.GetXFontComponent(wxXLFD_ENCODING).Upper();
 

-    if ( registry == _T("ISO8859") )
+    if ( registry == wxT("ISO8859") )

     {
         int cp;
         if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
     {
         int cp;
         if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )


@@ -381,7 +375,7 @@ void wxFontRefData::InitFromNative()
             m_encoding = (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
         }
     }
             m_encoding = (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
         }
     }

-    else if ( registry == _T("MICROSOFT") )
+    else if ( registry == wxT("MICROSOFT") )

     {
         int cp;
         if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
     {
         int cp;
         if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )


@@ -389,7 +383,7 @@ void wxFontRefData::InitFromNative()
             m_encoding = (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
         }
     }
             m_encoding = (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
         }
     }

-    else if ( registry == _T("KOI8") )
+    else if ( registry == wxT("KOI8") )

     {
         m_encoding = wxFONTENCODING_KOI8;
     }
     {
         m_encoding = wxFONTENCODING_KOI8;
     }


@@ -414,8 +408,6 @@ wxFontRefData::wxFontRefData( const wxFontRefData& data )
     m_faceName = data.m_faceName;
     m_encoding = data.m_encoding;
 
     m_faceName = data.m_faceName;
     m_encoding = data.m_encoding;
 

-    m_noAA = data.m_noAA;
-

     m_nativeFontInfo = data.m_nativeFontInfo;
 }
 
     m_nativeFontInfo = data.m_nativeFontInfo;
 }
 


@@ -498,7 +490,7 @@ void wxFontRefData::SetStyle(wxFontStyle style)
             pango_font_description_set_style( desc, PANGO_STYLE_OBLIQUE );
             break;
         default:
             pango_font_description_set_style( desc, PANGO_STYLE_OBLIQUE );
             break;
         default:

-            wxFAIL_MSG( _T("unknown font style") );
+            wxFAIL_MSG( wxT("unknown font style") );

             // fall through
         case wxFONTSTYLE_NORMAL:
             pango_font_description_set_style( desc, PANGO_STYLE_NORMAL );
             // fall through
         case wxFONTSTYLE_NORMAL:
             pango_font_description_set_style( desc, PANGO_STYLE_NORMAL );


@@ -652,7 +644,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
         wxString registry = tn.GetNextToken().MakeUpper(),
                  encoding = tn.GetNextToken().MakeUpper();
 
         wxString registry = tn.GetNextToken().MakeUpper(),
                  encoding = tn.GetNextToken().MakeUpper();
 

-        if ( registry == _T("ISO8859") )
+        if ( registry == wxT("ISO8859") )

         {
             int cp;
             if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )
         {
             int cp;
             if ( wxSscanf(encoding, wxT("%d"), &cp) == 1 )


@@ -661,7 +653,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
                     (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
             }
         }
                     (wxFontEncoding)(wxFONTENCODING_ISO8859_1 + cp - 1);
             }
         }

-        else if ( registry == _T("MICROSOFT") )
+        else if ( registry == wxT("MICROSOFT") )

         {
             int cp;
             if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )
         {
             int cp;
             if ( wxSscanf(encoding, wxT("cp125%d"), &cp) == 1 )


@@ -670,7 +662,7 @@ bool wxFont::Create(const wxString& fontname, wxFontEncoding enc)
                     (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
             }
         }
                     (wxFontEncoding)(wxFONTENCODING_CP1250 + cp);
             }
         }

-        else if ( registry == _T("KOI8") )
+        else if ( registry == wxT("KOI8") )

         {
             M_FONTDATA->m_encoding = wxFONTENCODING_KOI8;
         }
         {
             M_FONTDATA->m_encoding = wxFONTENCODING_KOI8;
         }


@@ -733,10 +725,8 @@ wxString wxFont::GetFaceName() const
     return M_FONTDATA->m_faceName;
 }
 
     return M_FONTDATA->m_faceName;
 }
 

-wxFontFamily wxFont::GetFamily() const
+wxFontFamily wxFont::DoGetFamily() const

 {
 {

-    wxCHECK_MSG( Ok(), wxFONTFAMILY_MAX, wxT("invalid font") );
-

     return M_FONTDATA->m_family;
 }
 
     return M_FONTDATA->m_family;
 }
 


@@ -768,13 +758,6 @@ wxFontEncoding wxFont::GetEncoding() const
     return M_FONTDATA->m_encoding;
 }
 
     return M_FONTDATA->m_encoding;
 }
 

-bool wxFont::GetNoAntiAliasing() const
-{
-    wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
-
-    return M_FONTDATA->m_noAA;
-}
-

 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid font") );
 const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid font") );


@@ -803,7 +786,7 @@ bool wxFont::IsFixedWidth() const
         wxString spacing = M_FONTDATA->
                             m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING);
 
         wxString spacing = M_FONTDATA->
                             m_nativeFontInfo.GetXFontComponent(wxXLFD_SPACING);
 

-        return spacing.Upper() == _T('M');
+        return spacing.Upper() == wxT('M');

     }
    // Unreaceable code for now
    // return wxFontBase::IsFixedWidth();
     }
    // Unreaceable code for now
    // return wxFontBase::IsFixedWidth();


@@ -872,15 +855,7 @@ void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
     M_FONTDATA->SetNativeFontInfo( info );
 }
 
     M_FONTDATA->SetNativeFontInfo( info );
 }
 

-void wxFont::SetNoAntiAliasing( bool no )
-{
-    Unshare();
-
-    M_FONTDATA->SetNoAntiAliasing( no );
-}
-
-#if wxUSE_UNICODE
-#else
+#if !wxUSE_UNICODE

 
 // ----------------------------------------------------------------------------
 // X11 implementation
 
 // ----------------------------------------------------------------------------
 // X11 implementation


@@ -946,4 +921,4 @@ WXFontStructPtr wxFont::GetFontStruct(double scale, WXDisplay* display) const
     return (f ? f->m_fontStruct : (WXFontStructPtr) 0);
 }
 
     return (f ? f->m_fontStruct : (WXFontStructPtr) 0);
 }
 

-#endif
+#endif // !wxUSE_UNICODE