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

initialize the font fields properly when it corresponds to a native font

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2003-08-11 01:14:34 +00:00
parent 0e7761fade
commit be5b2f9f38
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/font.cpp
View File

@ -86,6 +86,9 @@ public:
#endif // GTK 2.0/1.x #endif // GTK 2.0/1.x
} }
// reinitilize the font with the gived XFLD
void ReInit(const wxString& fontname);
// 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);
@ -437,6 +440,13 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
InitFromNative(); InitFromNative();
} }
void wxFontRefData::ReInit(const wxString& fontname)
{
m_nativeFontInfo.SetXFontName(fontname);
InitFromNative();
}
void wxFontRefData::ClearGdkFonts() void wxFontRefData::ClearGdkFonts()
{ {
#ifndef __WXGTK20__ #ifndef __WXGTK20__
@ -952,7 +962,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
&xfontname); &xfontname);
if ( font ) if ( font )
{ {
M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname); M_FONTDATA->m_nativeFontInfo.ReInit(xfontname);
} }
} }
} }

12
src/gtk1/font.cpp
View File

@ -86,6 +86,9 @@ public:
#endif // GTK 2.0/1.x #endif // GTK 2.0/1.x
} }
// reinitilize the font with the gived XFLD
void ReInit(const wxString& fontname);
// 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);
@ -437,6 +440,13 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
InitFromNative(); InitFromNative();
} }
void wxFontRefData::ReInit(const wxString& fontname)
{
m_nativeFontInfo.SetXFontName(fontname);
InitFromNative();
}
void wxFontRefData::ClearGdkFonts() void wxFontRefData::ClearGdkFonts()
{ {
#ifndef __WXGTK20__ #ifndef __WXGTK20__
@ -952,7 +962,7 @@ GdkFont *wxFont::GetInternalFont( float scale ) const
&xfontname); &xfontname);
if ( font ) if ( font )
{ {
M_FONTDATA->m_nativeFontInfo.SetXFontName(xfontname); M_FONTDATA->m_nativeFontInfo.ReInit(xfontname);
} }
} }
} }