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

don't need Pango workaround code with GTK+3

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2013-11-10 18:35:47 +00:00
parent f5af3df32e
commit 3000a9241e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gtk/font.cpp
View File

@@ -487,6 +487,7 @@ bool wxFont::GTKSetPangoAttrs(PangoLayout* layout) const
PangoAttrList* attrs = pango_attr_list_new(); PangoAttrList* attrs = pango_attr_list_new();
PangoAttribute* a; PangoAttribute* a;
#ifndef __WXGTK3__
if (wx_pango_version_check(1,16,0)) if (wx_pango_version_check(1,16,0))
{ {
// a PangoLayout which has leading/trailing spaces with underlined font // a PangoLayout which has leading/trailing spaces with underlined font
@@ -525,6 +526,8 @@ bool wxFont::GTKSetPangoAttrs(PangoLayout* layout) const
pango_attr_list_insert(attrs, a); pango_attr_list_insert(attrs, a);
} }
} }
#endif // !__WXGTK3__
if (GetUnderlined()) if (GetUnderlined())
{ {
a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);