X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0af0d98b5bb65da9f6b64a90dc3cfb642ee188e..88db1d64cb9e20de436a3503952dc9303060c33a:/src/gtk/font.cpp?ds=sidebyside

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 560d5f67c8..20ce420439 100644
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -86,11 +86,6 @@ public:
 #endif // GTK 2.0/1.x
     }
 
-#ifndef __WXGTK20__
-    // reinitilize the font with the gived XFLD
-    void ReInit(const wxString& fontname);
-#endif
-
     // setters: all of them also take care to modify m_nativeFontInfo if we
     // have it so as to not lose the information not carried by our fields
     void SetPointSize(int pointSize);
@@ -447,24 +442,6 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
     InitFromNative();
 }
 
-#ifndef __WXGTK20__
-
-void wxFontRefData::ReInit(const wxString& fontname)
-{
-    // calling InitFromNative() resets m_underlined flag as X11 fonts are never
-    // underlined, but we don't want to lose its old value here so save it ...
-    bool underlined = m_underlined;
-
-    m_nativeFontInfo.SetXFontName(fontname);
-
-    InitFromNative();
-
-    // ... and restore it now
-    m_underlined = underlined;
-}
-
-#endif // !__WXGTK20__
-
 void wxFontRefData::ClearGdkFonts()
 {
 #ifndef __WXGTK20__
@@ -809,8 +786,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);
@@ -961,7 +943,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());
             }
@@ -978,10 +960,10 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
                                                M_FONTDATA->m_faceName,
                                                M_FONTDATA->m_encoding,
                                                &xfontname);
-                if ( font )
-                {
-                    M_FONTDATA->ReInit(xfontname);
-                }
+                // NB: wxFont::GetNativeFontInfo relies on this 
+                //     side-effect of GetInternalFont
+                if ( int_scale == 100 )
+                    M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname);
             }
         }