X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9045ad9dfc9d205ad645e6d496bec9ccddd91ced..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/gtk/font.cpp diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 8735f843f7..f62f55b840 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -3,7 +3,7 @@ // Purpose: // Author: Robert Roebling // Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,10 +15,13 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "font.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/font.h" #include "wx/fontutil.h" #include "wx/cmndata.h" @@ -83,6 +86,11 @@ 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); @@ -434,6 +442,15 @@ wxFontRefData::wxFontRefData(const wxString& fontname) InitFromNative(); } +#ifndef __WXGTK20__ +void wxFontRefData::ReInit(const wxString& fontname) +{ + m_nativeFontInfo.SetXFontName(fontname); + + InitFromNative(); +} +#endif + void wxFontRefData::ClearGdkFonts() { #ifndef __WXGTK20__ @@ -949,7 +966,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const &xfontname); if ( font ) { - M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname); + M_FONTDATA->ReInit(xfontname); } } }