X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..81f6ea4a29eb815dbed0adea369efdc8fece0269:/src/gtk/font.cpp?ds=sidebyside

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 84319a4f0a..e174e7c2d0 100644
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -15,10 +15,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "font.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -97,7 +93,7 @@ public:
     void SetEncoding(wxFontEncoding encoding);
 
     void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; }
-    bool GetNoAntiAliasing() { return m_noAA; }
+    bool GetNoAntiAliasing() const { return m_noAA; }
 
     // and this one also modifies all the other font data fields
     void SetNativeFontInfo(const wxNativeFontInfo& info);
@@ -239,44 +235,11 @@ void wxFontRefData::InitFromNative()
     // Pango sometimes needs to have a size
     int pango_size = pango_font_description_get_size( desc );
     if (pango_size == 0)
-        pango_font_description_set_size( desc, 12 * PANGO_SCALE);
-        
-    m_pointSize = pango_font_description_get_size( desc ) / PANGO_SCALE;
+        m_nativeFontInfo.SetPointSize(12);
 
-    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;
-    }
+    m_pointSize = m_nativeFontInfo.GetPointSize();
+    m_style = m_nativeFontInfo.GetStyle();
+    m_weight = m_nativeFontInfo.GetWeight();
 
     if (m_faceName == wxT("monospace"))
     {
@@ -471,10 +434,7 @@ 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 );
+    m_nativeFontInfo.SetPointSize(pointSize);
 #else
     if ( HasNativeFont() )
     {
@@ -501,24 +461,7 @@ 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;
-    }
+    m_nativeFontInfo.SetStyle((wxFontStyle)style);
 #else
     if ( HasNativeFont() )
     {
@@ -551,25 +494,7 @@ 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);
-    }
+    m_nativeFontInfo.SetWeight((wxFontWeight)weight);
 #else //!__WXGTK20__
     if ( HasNativeFont() )
     {
@@ -609,7 +534,9 @@ void wxFontRefData::SetFaceName(const wxString& facename)
 {
     m_faceName = facename;
 
-#ifndef __WXGTK20__
+#ifdef __WXGTK20__
+    m_nativeFontInfo.SetFaceName(facename);
+#else
     if ( HasNativeFont() )
     {
         m_nativeFontInfo.SetXFontComponent(wxXLFD_FAMILY, facename);
@@ -729,35 +656,67 @@ int wxFont::GetPointSize() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
+#if wxUSE_PANGO
+    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetPointSize()
+                                       : M_FONTDATA->m_pointSize;
+#else
     return M_FONTDATA->m_pointSize;
+#endif
 }
 
 wxString wxFont::GetFaceName() const
 {
     wxCHECK_MSG( Ok(), wxT(""), wxT("invalid font") );
 
+#if wxUSE_PANGO
+    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetFaceName()
+                                       : M_FONTDATA->m_faceName;
+#else
     return M_FONTDATA->m_faceName;
+#endif
 }
 
 int wxFont::GetFamily() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
+#if wxUSE_PANGO
+    int ret = M_FONTDATA->m_family;
+    if (M_FONTDATA->HasNativeFont())
+        // wxNativeFontInfo::GetFamily is expensive, must not call more than once
+        ret = M_FONTDATA->m_nativeFontInfo.GetFamily();
+
+    if (ret == wxFONTFAMILY_DEFAULT)
+        ret = M_FONTDATA->m_family;
+
+    return ret;
+#else
     return M_FONTDATA->m_family;
+#endif
 }
 
 int wxFont::GetStyle() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
+#if wxUSE_PANGO
+    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetStyle()
+                                       : M_FONTDATA->m_style;
+#else
     return M_FONTDATA->m_style;
+#endif
 }
 
 int wxFont::GetWeight() const
 {
     wxCHECK_MSG( Ok(), 0, wxT("invalid font") );
 
+#if wxUSE_PANGO
+    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetWeight()
+                                       : M_FONTDATA->m_weight;
+#else
     return M_FONTDATA->m_weight;
+#endif
 }
 
 bool wxFont::GetUnderlined() const
@@ -771,10 +730,11 @@ 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") );
 
@@ -786,8 +746,13 @@ 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 &(M_FONTDATA->m_nativeFontInfo);
@@ -938,7 +903,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());
             }
@@ -955,6 +920,10 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
                                                M_FONTDATA->m_faceName,
                                                M_FONTDATA->m_encoding,
                                                &xfontname);
+                // NB: wxFont::GetNativeFontInfo relies on this
+                //     side-effect of GetInternalFont
+                if ( int_scale == 100 )
+                    M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname);
             }
         }