From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 16 Apr 2007 21:46:59 +0000 (+0000)
Subject: reverted last change as using pango_version_check() (unavailable in the old Pango... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d6a54ad7c81202530a4177ff50bcd517ee07cd1c?ds=inline

reverted last change as using pango_version_check() (unavailable in the old Pango versions) makes wx applications impossible to run on older systems


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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index c064590ae8..81eaf12861 100644
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1472,16 +1472,11 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         return;
     size_t datalen = strlen(data);
 
-#ifdef PANGO_VERSION_MAJOR
-    // in Pango >= 1.16 the "underline of leading/trailing spaces" bug has been fixed...
-    static bool pangoOk = (pango_version_check(1, 16, 1) == NULL);
-#else
-    // the version of Pango used for compiling wxWidgets does not have version macros/functions...
-    // we are forced to assume that the run-time version of Pango is older than 1.16
-    const bool pangoOk = false;
-#endif
-
-    bool needshack = underlined && !pangoOk;
+    // TODO: as soon as Pango provides a function to check at runtime its
+    //       version, we can use it to disable the underline hack for
+    //       Pango >= 1.16 as the "underline of leading/trailing spaces"
+    //       has been fixed there
+    bool needshack = underlined;
     char *hackstring = NULL;
 
     if (needshack)