X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/464f1a1da6190a3109a5c5396e3bddcaa43468b6..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/gtk1/font.cpp

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 0ad6019e38..03e3fd5521 100644
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/font.cpp
+// Name:        src/gtk1/font.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling and Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -15,22 +15,25 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "font.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
 #include "wx/font.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/settings.h"
+    #include "wx/cmndata.h"
+    #include "wx/gdicmn.h"
+#endif
+
 #include "wx/fontutil.h"
-#include "wx/cmndata.h"
 #include "wx/utils.h"
-#include "wx/log.h"
-#include "wx/gdicmn.h"
 #include "wx/tokenzr.h"
-#include "wx/settings.h"
 
 #include <strings.h>
 
-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"
 #include <gdk/gdkprivate.h>
 
 // ----------------------------------------------------------------------------
@@ -59,7 +62,7 @@ public:
                   int family = wxFONTFAMILY_DEFAULT,
                   int style = wxFONTSTYLE_NORMAL,
                   int weight = wxFONTWEIGHT_NORMAL,
-                  bool underlined = FALSE,
+                  bool underlined = false,
                   const wxString& faceName = wxEmptyString,
                   wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 
@@ -74,13 +77,8 @@ public:
     // do we have the native font info?
     bool HasNativeFont() const
     {
-#ifdef __WXGTK20__
-        // we always have a Pango font description
-        return TRUE;
-#else // GTK 1.x
         // only use m_nativeFontInfo if it had been initialized
         return !m_nativeFontInfo.IsDefault();
-#endif // GTK 2.0/1.x
     }
 
     // setters: all of them also take care to modify m_nativeFontInfo if we
@@ -90,11 +88,11 @@ public:
     void SetStyle(int style);
     void SetWeight(int weight);
     void SetUnderlined(bool underlined);
-    void SetFaceName(const wxString& facename);
+    bool SetFaceName(const wxString& facename);
     void SetEncoding(wxFontEncoding encoding);
 
-    void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }
-    bool GetNoAntiAliasing() { return m_noAA; }
+    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);
@@ -103,7 +101,7 @@ public:
     //
     // VZ: I need this as my gdb either shows wildly wrong values or crashes
     //     when I ask it to "p fontRefData" :-(
-#if defined(__WXDEBUG__) && !defined(__WXGTK20__)
+#if defined(__WXDEBUG__)
     void Dump() const
     {
         wxPrintf(_T("%s-%s-%s-%d-%d\n"),
@@ -136,10 +134,8 @@ private:
     // clear m_scaled_xfonts if any
     void ClearGdkFonts();
 
-#ifndef __WXGTK20__
     // the map of font sizes to "GdkFont *"
     wxScaledFontList  m_scaled_xfonts;
-#endif // GTK 2.0/1.x
 
     int             m_pointSize;
     int             m_family,
@@ -186,113 +182,13 @@ void wxFontRefData::Init(int pointSize,
     m_underlined = underlined;
     m_encoding = encoding;
 
-    m_noAA = FALSE;
-
-#ifdef __WXGTK20__
-    // Create native font info
-    m_nativeFontInfo.description = pango_font_description_new();
-
-    // And set its values
-    if (!m_faceName.empty())
-    {
-       pango_font_description_set_family( m_nativeFontInfo.description, wxGTK_CONV(m_faceName) );
-    }
-    else
-    {
-        switch (m_family)
-        {
-            case wxFONTFAMILY_MODERN:
-            case wxFONTFAMILY_TELETYPE:
-               pango_font_description_set_family( m_nativeFontInfo.description, "monospace" );
-               break;
-            case wxFONTFAMILY_ROMAN:
-               pango_font_description_set_family( m_nativeFontInfo.description, "serif" );
-               break;
-            case wxFONTFAMILY_SWISS:
-               // SWISS = sans serif
-            default:
-               pango_font_description_set_family( m_nativeFontInfo.description, "sans" );
-               break;
-        }
-    }
-
-    SetStyle( m_style );
-    SetPointSize( m_pointSize );
-    SetWeight( m_weight );
-#endif // GTK 2.0
+    m_noAA = false;
 }
 
 void wxFontRefData::InitFromNative()
 {
-    m_noAA = FALSE;
-
-#ifdef __WXGTK20__
-    // Get native info
-    PangoFontDescription *desc = m_nativeFontInfo.description;
-
-    // init fields
-    m_faceName = wxGTK_CONV_BACK( pango_font_description_get_family( desc ) );
+    m_noAA = false;
 
-    m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE;
-
-    switch (pango_font_description_get_style( desc ))
-    {
-        case PANGO_STYLE_NORMAL:
-            m_style = wxFONTSTYLE_NORMAL;
-            break;
-        case PANGO_STYLE_ITALIC:
-            m_style = wxFONTSTYLE_ITALIC;
-            break;
-        case PANGO_STYLE_OBLIQUE:
-            m_style = wxFONTSTYLE_SLANT;
-            break;
-    }
-
-    switch (pango_font_description_get_weight( desc ))
-    {
-        case PANGO_WEIGHT_ULTRALIGHT:
-            m_weight = wxFONTWEIGHT_LIGHT;
-            break;
-        case PANGO_WEIGHT_LIGHT:
-            m_weight = wxFONTWEIGHT_LIGHT;
-            break;
-        case PANGO_WEIGHT_NORMAL:
-            m_weight = wxFONTWEIGHT_NORMAL;
-            break;
-        case PANGO_WEIGHT_BOLD:
-            m_weight = wxFONTWEIGHT_BOLD;
-            break;
-        case PANGO_WEIGHT_ULTRABOLD:
-            m_weight = wxFONTWEIGHT_BOLD;
-            break;
-        case PANGO_WEIGHT_HEAVY:
-            m_weight = wxFONTWEIGHT_BOLD;
-            break;
-    }
-
-    if (m_faceName == wxT("monospace"))
-    {
-        m_family = wxFONTFAMILY_TELETYPE;
-    }
-    else if (m_faceName == wxT("sans"))
-    {
-        m_family = wxFONTFAMILY_SWISS;
-    }
-    else if (m_faceName == wxT("serif"))
-    {
-        m_family = wxFONTFAMILY_ROMAN;
-    }
-    else
-    {
-        m_family = wxFONTFAMILY_UNKNOWN;
-    }
-
-    // Pango description are never underlined (?)
-    m_underlined = FALSE;
-
-    // Cannot we choose that
-    m_encoding = wxFONTENCODING_SYSTEM;
-#else // GTK 1.x
     // get the font parameters from the XLFD
     // -------------------------------------
 
@@ -358,7 +254,7 @@ void wxFontRefData::InitFromNative()
     }
 
     // X fonts are never underlined...
-    m_underlined = FALSE;
+    m_underlined = false;
 
     // deal with font encoding
     wxString
@@ -390,7 +286,6 @@ void wxFontRefData::InitFromNative()
         // may be give a warning here? or use wxFontMapper?
         m_encoding = wxFONTENCODING_SYSTEM;
     }
-#endif // GTK 2.0/1.x
 }
 
 wxFontRefData::wxFontRefData( const wxFontRefData& data )
@@ -424,19 +319,14 @@ wxFontRefData::wxFontRefData(int size, int family, int style,
 
 wxFontRefData::wxFontRefData(const wxString& fontname)
 {
-    // VZ: FromString() should really work in both cases, doesn't it?
-#ifdef __WXGTK20__
-    m_nativeFontInfo.FromString( fontname );
-#else // GTK 1.x
+    // FromString() should really work in GTK1 too, doesn't it?
     m_nativeFontInfo.SetXFontName(fontname);
-#endif // GTK 2.0/1.x
 
     InitFromNative();
 }
 
 void wxFontRefData::ClearGdkFonts()
 {
-#ifndef __WXGTK20__
     for ( wxScaledFontList::iterator i = m_scaled_xfonts.begin();
           i != m_scaled_xfonts.end();
           ++i )
@@ -446,7 +336,6 @@ void wxFontRefData::ClearGdkFonts()
     }
 
     m_scaled_xfonts.clear();
-#endif // GTK 1.x
 }
 
 wxFontRefData::~wxFontRefData()
@@ -462,12 +351,6 @@ void wxFontRefData::SetPointSize(int pointSize)
 {
     m_pointSize = pointSize;
 
-#ifdef __WXGTK20__
-    // Get native info
-    PangoFontDescription *desc = m_nativeFontInfo.description;
-
-    pango_font_description_set_size( desc, m_pointSize * PANGO_SCALE );
-#else
     if ( HasNativeFont() )
     {
         wxString size;
@@ -478,7 +361,6 @@ void wxFontRefData::SetPointSize(int pointSize)
 
         m_nativeFontInfo.SetXFontComponent(wxXLFD_POINTSIZE, size);
     }
-#endif
 }
 
 void wxFontRefData::SetFamily(int family)
@@ -492,26 +374,6 @@ void wxFontRefData::SetStyle(int style)
 {
     m_style = style;
 
-#ifdef __WXGTK20__
-    // Get native info
-    PangoFontDescription *desc = m_nativeFontInfo.description;
-
-    switch ( style )
-    {
-        case wxFONTSTYLE_ITALIC:
-            pango_font_description_set_style( desc, PANGO_STYLE_ITALIC );
-            break;
-        case wxFONTSTYLE_SLANT:
-            pango_font_description_set_style( desc, PANGO_STYLE_OBLIQUE );
-            break;
-        default:
-            wxFAIL_MSG( _T("unknown font style") );
-            // fall through
-        case wxFONTSTYLE_NORMAL:
-            pango_font_description_set_style( desc, PANGO_STYLE_NORMAL );
-            break;
-    }
-#else
     if ( HasNativeFont() )
     {
         wxString slant;
@@ -535,34 +397,12 @@ void wxFontRefData::SetStyle(int style)
 
         m_nativeFontInfo.SetXFontComponent(wxXLFD_SLANT, slant);
     }
-#endif
 }
 
 void wxFontRefData::SetWeight(int weight)
 {
     m_weight = weight;
 
-#ifdef __WXGTK20__
-    PangoFontDescription *desc = m_nativeFontInfo.description;
-    switch ( weight )
-    {
-        case wxFONTWEIGHT_BOLD:
-            pango_font_description_set_weight(desc, PANGO_WEIGHT_BOLD);
-            break;
-
-        case wxFONTWEIGHT_LIGHT:
-            pango_font_description_set_weight(desc, PANGO_WEIGHT_LIGHT);
-            break;
-
-        default:
-            wxFAIL_MSG( _T("unknown font weight") );
-            // fall through
-
-        case wxFONTWEIGHT_NORMAL:
-            // unspecified
-            pango_font_description_set_weight(desc, PANGO_WEIGHT_NORMAL);
-    }
-#else //!__WXGTK20__
     if ( HasNativeFont() )
     {
         wxString boldness;
@@ -587,7 +427,6 @@ void wxFontRefData::SetWeight(int weight)
 
         m_nativeFontInfo.SetXFontComponent(wxXLFD_WEIGHT, boldness);
     }
-#endif
 }
 
 void wxFontRefData::SetUnderlined(bool underlined)
@@ -597,23 +436,22 @@ void wxFontRefData::SetUnderlined(bool underlined)
     // the XLFD doesn't have "underlined" field anyhow
 }
 
-void wxFontRefData::SetFaceName(const wxString& facename)
+bool wxFontRefData::SetFaceName(const wxString& facename)
 {
     m_faceName = facename;
 
-#ifndef __WXGTK20__
     if ( HasNativeFont() )
     {
         m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename);
     }
-#endif
+
+    return true;
 }
 
 void wxFontRefData::SetEncoding(wxFontEncoding encoding)
 {
     m_encoding = encoding;
 
-#ifndef __WXGTK20__
     if ( HasNativeFont() )
     {
         wxNativeEncodingInfo info;
@@ -623,7 +461,6 @@ void wxFontRefData::SetEncoding(wxFontEncoding encoding)
             m_nativeFontInfo.SetXFontComponent(wxXLFD_ENCODING, info.xencoding);
         }
     }
-#endif
 }
 
 void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
@@ -643,25 +480,9 @@ void wxFontRefData::SetNativeFontInfo(const wxNativeFontInfo& info)
 
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
-void wxFont::Init()
-{
-}
-
 wxFont::wxFont(const wxNativeFontInfo& info)
 {
-    Init();
-
-#ifdef __WXGTK20__
-    Create( info.GetPointSize(),
-            info.GetFamily(),
-            info.GetStyle(),
-            info.GetWeight(),
-            info.GetUnderlined(),
-            info.GetFaceName(),
-            info.GetEncoding() );
-#else
     (void) Create(info.GetXFontName());
-#endif
 }
 
 bool wxFont::Create( int pointSize,
@@ -677,7 +498,7 @@ bool wxFont::Create( int pointSize,
     m_refData = new wxFontRefData(pointSize, family, style, weight,
                                   underlined, face, encoding);
 
-    return TRUE;
+    return true;
 }
 
 bool wxFont::Create(const wxString& fontname)
@@ -687,12 +508,12 @@ bool wxFont::Create(const wxString& fontname)
     {
         *this = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
 
-        return TRUE;
+        return true;
     }
 
     m_refData = new wxFontRefData(fontname);
 
-    return TRUE;
+    return true;
 }
 
 void wxFont::Unshare()
@@ -726,7 +547,7 @@ int wxFont::GetPointSize() const
 
 wxString wxFont::GetFaceName() const
 {
-    wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
+    wxCHECK_MSG( Ok(), wxEmptyString, wxT("invalid font") );
 
     return M_FONTDATA->m_faceName;
 }
@@ -754,7 +575,7 @@ int wxFont::GetWeight() const
 
 bool wxFont::GetUnderlined() const
 {
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
 
     return M_FONTDATA->m_underlined;
 }
@@ -763,33 +584,36 @@ wxFontEncoding wxFont::GetEncoding() const
 {
     wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
 
+    // m_encoding is unused in wxGTK2, return encoding that the user set.
     return M_FONTDATA->m_encoding;
 }
 
-bool wxFont::GetNoAntiAliasing()
+bool wxFont::GetNoAntiAliasing() const
 {
     wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") );
 
     return M_FONTDATA->m_noAA;
 }
 
-wxNativeFontInfo *wxFont::GetNativeFontInfo() const
+const wxNativeFontInfo *wxFont::GetNativeFontInfo() const
 {
     wxCHECK_MSG( Ok(), (wxNativeFontInfo *)NULL, wxT("invalid font") );
 
-#ifndef __WXGTK20__
-    if ( M_FONTDATA->m_nativeFontInfo.GetXFontName().empty() )
+    if ( !M_FONTDATA->HasNativeFont() )
+    {
+        // NB: this call has important side-effect: it not only finds
+        //     GdkFont representation, it also initializes m_nativeFontInfo
+        //     by calling its SetXFontName method
         GetInternalFont();
-#endif
+    }
 
-    return new wxNativeFontInfo(M_FONTDATA->m_nativeFontInfo);
+    return &(M_FONTDATA->m_nativeFontInfo);
 }
 
 bool wxFont::IsFixedWidth() const
 {
-    wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
+    wxCHECK_MSG( Ok(), false, wxT("invalid font") );
 
-#ifndef __WXGTK20__
     if ( M_FONTDATA->HasNativeFont() )
     {
         // the monospace fonts are supposed to have "M" in the spacing field
@@ -798,7 +622,6 @@ bool wxFont::IsFixedWidth() const
 
         return spacing.Upper() == _T('M');
     }
-#endif
 
     return wxFontBase::IsFixedWidth();
 }
@@ -835,11 +658,12 @@ void wxFont::SetWeight(int weight)
     M_FONTDATA->SetWeight(weight);
 }
 
-void wxFont::SetFaceName(const wxString& faceName)
+bool wxFont::SetFaceName(const wxString& faceName)
 {
     Unshare();
 
-    M_FONTDATA->SetFaceName(faceName);
+    return M_FONTDATA->SetFaceName(faceName) &&
+           wxFontBase::SetFaceName(faceName);
 }
 
 void wxFont::SetUnderlined(bool underlined)
@@ -856,7 +680,7 @@ void wxFont::SetEncoding(wxFontEncoding encoding)
     M_FONTDATA->SetEncoding(encoding);
 }
 
-void wxFont::SetNativeFontInfo( const wxNativeFontInfo& info )
+void wxFont::DoSetNativeFontInfo( const wxNativeFontInfo& info )
 {
     Unshare();
 
@@ -874,7 +698,6 @@ void wxFont::SetNoAntiAliasing( bool no )
 // get internal representation of font
 // ----------------------------------------------------------------------------
 
-#ifndef __WXGTK20__
 static GdkFont *g_systemDefaultGuiFont = (GdkFont*) NULL;
 
 // this is also used from tbargtk.cpp and tooltip.cpp, hence extern
@@ -909,7 +732,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
 {
     GdkFont *font = (GdkFont *) NULL;
 
-    wxCHECK_MSG( Ok(), font, wxT("invalid font") )
+    wxCHECK_MSG( Ok(), font, wxT("invalid font") );
 
     long int_scale = long(scale * 100.0 + 0.5); // key for fontlist
     int point_scale = (int)((M_FONTDATA->m_pointSize * 10 * int_scale) / 100);
@@ -930,7 +753,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
         if ( !font )
         {
             // do we have the XLFD?
-            if ( M_FONTDATA->HasNativeFont() )
+            if ( int_scale == 100 && M_FONTDATA->HasNativeFont() )
             {
                 font = wxLoadFont(M_FONTDATA->m_nativeFontInfo.GetXFontName());
             }
@@ -947,10 +770,10 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
                                                M_FONTDATA->m_faceName,
                                                M_FONTDATA->m_encoding,
                                                &xfontname);
-                if ( font )
-                {
+                // NB: wxFont::GetNativeFontInfo relies on this
+                //     side-effect of GetInternalFont
+                if ( int_scale == 100 )
                     M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname);
-                }
             }
         }
 
@@ -966,5 +789,3 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
 
     return font;
 }
-#endif  // not GTK 2.0
-