don't change the font by reinitializing it to XLFD which was found to match it in...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 560d5f67c88e216fe110b361b356afabc4069486..3989eea3bfcdd2e2a55b5609179426eb36ba7d74 100644 (file)
--- 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__
@@ -978,10 +955,6 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
                                                M_FONTDATA->m_faceName,
                                                M_FONTDATA->m_encoding,
                                                &xfontname);
-                if ( font )
-                {
-                    M_FONTDATA->ReInit(xfontname);
-                }
             }
         }
 

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 560d5f67c88e216fe110b361b356afabc4069486..3989eea3bfcdd2e2a55b5609179426eb36ba7d74 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/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__
@@ -978,10 +955,6 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
                                                M_FONTDATA->m_faceName,
                                                M_FONTDATA->m_encoding,
                                                &xfontname);
-                if ( font )
-                {
-                    M_FONTDATA->ReInit(xfontname);
-                }
             }
         }