From a0af0d98b5bb65da9f6b64a90dc3cfb642ee188e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 5 Mar 2004 14:09:36 +0000 Subject: [PATCH] don't lose fonts underlined flag in ReInit() (bug fix for the change in rev. 1.76) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/font.cpp | 11 ++++++++++- src/gtk1/font.cpp | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index cdaa71a813..560d5f67c8 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -448,13 +448,22 @@ wxFontRefData::wxFontRefData(const wxString& fontname) } #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 + +#endif // !__WXGTK20__ void wxFontRefData::ClearGdkFonts() { diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp index cdaa71a813..560d5f67c8 100644 --- a/src/gtk1/font.cpp +++ b/src/gtk1/font.cpp @@ -448,13 +448,22 @@ wxFontRefData::wxFontRefData(const wxString& fontname) } #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 + +#endif // !__WXGTK20__ void wxFontRefData::ClearGdkFonts() { -- 2.50.0