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

GTK2 compilation fix for Vadim's compilation fix

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-14 19:24:59 +00:00
parent 343acb82b7
commit 0aa1258a1b
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/font.cpp
View File

@@ -86,8 +86,10 @@ public:
#endif // GTK 2.0/1.x #endif // GTK 2.0/1.x
} }
#ifndef __WXGTK20__
// reinitilize the font with the gived XFLD // reinitilize the font with the gived XFLD
void ReInit(const wxString& fontname); 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
@@ -440,12 +442,14 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
InitFromNative(); InitFromNative();
} }
#ifndef __WXGTK20__
void wxFontRefData::ReInit(const wxString& fontname) void wxFontRefData::ReInit(const wxString& fontname)
{ {
m_nativeFontInfo.SetXFontName(fontname); m_nativeFontInfo.SetXFontName(fontname);
InitFromNative(); InitFromNative();
} }
#endif
void wxFontRefData::ClearGdkFonts() void wxFontRefData::ClearGdkFonts()
{ {

4
src/gtk1/font.cpp
View File

@@ -86,8 +86,10 @@ public:
#endif // GTK 2.0/1.x #endif // GTK 2.0/1.x
} }
#ifndef __WXGTK20__
// reinitilize the font with the gived XFLD // reinitilize the font with the gived XFLD
void ReInit(const wxString& fontname); 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
@@ -440,12 +442,14 @@ wxFontRefData::wxFontRefData(const wxString& fontname)
InitFromNative(); InitFromNative();
} }
#ifndef __WXGTK20__
void wxFontRefData::ReInit(const wxString& fontname) void wxFontRefData::ReInit(const wxString& fontname)
{ {
m_nativeFontInfo.SetXFontName(fontname); m_nativeFontInfo.SetXFontName(fontname);
InitFromNative(); InitFromNative();
} }
#endif
void wxFontRefData::ClearGdkFonts() void wxFontRefData::ClearGdkFonts()
{ {