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
This commit is contained in:
Vadim Zeitlin
2007-04-16 21:46:59 +00:00
parent a78303202f
commit d6a54ad7c8

View File

@@ -1472,16 +1472,11 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
return; return;
size_t datalen = strlen(data); size_t datalen = strlen(data);
#ifdef PANGO_VERSION_MAJOR // TODO: as soon as Pango provides a function to check at runtime its
// in Pango >= 1.16 the "underline of leading/trailing spaces" bug has been fixed... // version, we can use it to disable the underline hack for
static bool pangoOk = (pango_version_check(1, 16, 1) == NULL); // Pango >= 1.16 as the "underline of leading/trailing spaces"
#else // has been fixed there
// the version of Pango used for compiling wxWidgets does not have version macros/functions... bool needshack = underlined;
// 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;
char *hackstring = NULL; char *hackstring = NULL;
if (needshack) if (needshack)