X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..c543817b3280c560d53307c0fa98e7a99aa00bf9:/src/gtk/font.cpp?ds=sidebyside diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 3989eea3bf..6201232e19 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -97,7 +97,7 @@ public: void SetEncoding(wxFontEncoding encoding); void SetNoAntiAliasing( bool no = TRUE ) { m_noAA = no; } - bool GetNoAntiAliasing() { return m_noAA; } + bool GetNoAntiAliasing() const { return m_noAA; } // and this one also modifies all the other font data fields void SetNativeFontInfo(const wxNativeFontInfo& info); @@ -774,7 +774,7 @@ wxFontEncoding wxFont::GetEncoding() const return M_FONTDATA->m_encoding; } -bool wxFont::GetNoAntiAliasing() +bool wxFont::GetNoAntiAliasing() const { wxCHECK_MSG( Ok(), wxFONTENCODING_DEFAULT, wxT("invalid font") ); @@ -786,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); @@ -938,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()); } @@ -955,6 +960,10 @@ GdkFont *wxFont::GetInternalFont( float scale ) const M_FONTDATA->m_faceName, M_FONTDATA->m_encoding, &xfontname); + // NB: wxFont::GetNativeFontInfo relies on this + // side-effect of GetInternalFont + if ( int_scale == 100 ) + M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname); } }