implemented Freeze/Thaw() (patch 922156)

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

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index cdaa71a813b177455153a3e9b85b438ead3d40dc..3989eea3bfcdd2e2a55b5609179426eb36ba7d74 100644 (file)
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -86,11 +86,6 @@ public:
 #endif // GTK 2.0/1.x
     }
 
 #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);
     // 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,15 +442,6 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
     InitFromNative();
 }
 
     InitFromNative();
 }
 

-#ifndef __WXGTK20__
-void wxFontRefData::ReInit(const wxString& fontname)
-{
-    m_nativeFontInfo.SetXFontName(fontname);
-
-    InitFromNative();
-}
-#endif
-

 void wxFontRefData::ClearGdkFonts()
 {
 #ifndef __WXGTK20__
 void wxFontRefData::ClearGdkFonts()
 {
 #ifndef __WXGTK20__


@@ -969,10 +955,6 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
                                                M_FONTDATA->m_faceName,
                                                M_FONTDATA->m_encoding,
                                                &xfontname);
                                                M_FONTDATA->m_faceName,
                                                M_FONTDATA->m_encoding,
                                                &xfontname);

-                if ( font )
-                {
-                    M_FONTDATA->ReInit(xfontname);
-                }

             }
         }
 
             }
         }