Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-03-15 23:29:19 +00:00
parent 622a19f0ea
commit 85c09802c0
2 changed files with 0 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gtk/font.cpp
View File

@@ -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 // 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 // have it so as to not lose the information not carried by our fields
void SetPointSize(int pointSize); void SetPointSize(int pointSize);
@@ -447,24 +442,6 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
InitFromNative(); 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() void wxFontRefData::ClearGdkFonts()
{ {
#ifndef __WXGTK20__ #ifndef __WXGTK20__
@@ -978,10 +955,6 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
M_FONTDATA->m_faceName, M_FONTDATA->m_faceName,
M_FONTDATA->m_encoding, M_FONTDATA->m_encoding,
&xfontname); &xfontname);
if ( font )
{
M_FONTDATA->ReInit(xfontname);
}
} }
} }

27
src/gtk1/font.cpp
View File

@@ -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 // 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 // have it so as to not lose the information not carried by our fields
void SetPointSize(int pointSize); void SetPointSize(int pointSize);
@@ -447,24 +442,6 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
InitFromNative(); 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() void wxFontRefData::ClearGdkFonts()
{ {
#ifndef __WXGTK20__ #ifndef __WXGTK20__
@@ -978,10 +955,6 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
M_FONTDATA->m_faceName, M_FONTDATA->m_faceName,
M_FONTDATA->m_encoding, M_FONTDATA->m_encoding,
&xfontname); &xfontname);
if ( font )
{
M_FONTDATA->ReInit(xfontname);
}
} }
} }