From 0aa1258a1b2bf2323c65fc0264c51ebf1dd067a8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Thu, 14 Aug 2003 19:24:59 +0000 Subject: [PATCH] GTK2 compilation fix for Vadim's compilation fix git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/font.cpp | 4 ++++ src/gtk1/font.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index a7fed7deca..f62f55b840 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -86,8 +86,10 @@ 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 @@ -440,12 +442,14 @@ wxFontRefData::wxFontRefData(const wxString& fontname) InitFromNative(); } +#ifndef __WXGTK20__ void wxFontRefData::ReInit(const wxString& fontname) { m_nativeFontInfo.SetXFontName(fontname); InitFromNative(); } +#endif void wxFontRefData::ClearGdkFonts() { diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp index a7fed7deca..f62f55b840 100644 --- a/src/gtk1/font.cpp +++ b/src/gtk1/font.cpp @@ -86,8 +86,10 @@ 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 @@ -440,12 +442,14 @@ wxFontRefData::wxFontRefData(const wxString& fontname) InitFromNative(); } +#ifndef __WXGTK20__ void wxFontRefData::ReInit(const wxString& fontname) { m_nativeFontInfo.SetXFontName(fontname); InitFromNative(); } +#endif void wxFontRefData::ClearGdkFonts() { -- 2.45.2