[wxGTK2] Don't query native font for underlined, but return the set value - storing...

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 54cff23c0c3a6c939e6b81981f1191d72eeed233..f66691cbea36887815fc413477f5cd53c20c522e 100644 (file)
--- 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") );
 
 {
     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;
     return M_FONTDATA->m_underlined;

-#endif

 }
 
 wxFontEncoding wxFont::GetEncoding() const
 }
 
 wxFontEncoding wxFont::GetEncoding() const

diff --git a/src/gtk1/font.cpp b/src/gtk1/font.cpp
index 54cff23c0c3a6c939e6b81981f1191d72eeed233..f66691cbea36887815fc413477f5cd53c20c522e 100644 (file)
--- 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") );
 
 {
     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;
     return M_FONTDATA->m_underlined;

-#endif

 }
 
 wxFontEncoding wxFont::GetEncoding() const
 }
 
 wxFontEncoding wxFont::GetEncoding() const