X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5b2f9f38eb13d259a525b8d78106d370e05351..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/gtk/font.cpp diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 1047a2f503..f62f55b840 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -86,8 +86,10 @@ 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 @@ -440,12 +442,14 @@ wxFontRefData::wxFontRefData(const wxString& fontname) InitFromNative(); } +#ifndef __WXGTK20__ void wxFontRefData::ReInit(const wxString& fontname) { m_nativeFontInfo.SetXFontName(fontname); InitFromNative(); } +#endif void wxFontRefData::ClearGdkFonts() { @@ -962,7 +966,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const &xfontname); if ( font ) { - M_FONTDATA->m_nativeFontInfo.ReInit(xfontname); + M_FONTDATA->ReInit(xfontname); } } }