From 3000a9241e606b5257ee397dc0a38662bccf99c1 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 10 Nov 2013 18:35:47 +0000 Subject: [PATCH] don't need Pango workaround code with GTK+3 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/font.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gtk/font.cpp b/src/gtk/font.cpp index 734b7221c0..9cd46bac4b 100644 --- a/src/gtk/font.cpp +++ b/src/gtk/font.cpp @@ -487,6 +487,7 @@ bool wxFont::GTKSetPangoAttrs(PangoLayout* layout) const PangoAttrList* attrs = pango_attr_list_new(); PangoAttribute* a; +#ifndef __WXGTK3__ if (wx_pango_version_check(1,16,0)) { // 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); } } +#endif // !__WXGTK3__ + if (GetUnderlined()) { a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);