From: Mart Raudsepp <leio@gentoo.org>
Date: Mon, 22 Aug 2005 23:27:39 +0000 (+0000)
Subject: [wxGTK2] Don't query native font for underlined, but return the set value - storing... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/8c8c4b717a1042b56d235faf04587ded2099d465

[wxGTK2] Don't query native font for underlined, but return the set value - storing it natively would likely require
the usage of a PangoAttribute, and I'm not sure if that's even different than just storing it inside wxFontRefData.
Not investigating further as PangoAttribute addition would require ABI compatibility breakage anyhow.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp
index 54cff23c0c..f66691cbea 100644
--- a/src/gtk/font.cpp
+++ b/src/gtk/font.cpp
@@ -789,12 +789,7 @@ bool wxFont::GetUnderlined() const
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
 
-#if wxUSE_PANGO
-    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetUnderlined()
-                                       : M_FONTDATA->m_underlined;
-#else
     return M_FONTDATA->m_underlined;
-#endif
 }
 
 wxFontEncoding wxFont::GetEncoding() const
diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 54cff23c0c..f66691cbea 100644
--- a/src/gtk1/font.cpp
+++ b/src/gtk1/font.cpp
@@ -789,12 +789,7 @@ bool wxFont::GetUnderlined() const
 {
     wxCHECK_MSG( Ok(), FALSE, wxT("invalid font") );
 
-#if wxUSE_PANGO
-    return M_FONTDATA->HasNativeFont() ? M_FONTDATA->m_nativeFontInfo.GetUnderlined()
-                                       : M_FONTDATA->m_underlined;
-#else
     return M_FONTDATA->m_underlined;
-#endif
 }
 
 wxFontEncoding wxFont::GetEncoding() const