don't use Pango hack for drawing underlined text when using new enough version of Pango (patch 1697040)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1472,11 +1472,16 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
|
|||||||
return;
|
return;
|
||||||
size_t datalen = strlen(data);
|
size_t datalen = strlen(data);
|
||||||
|
|
||||||
// TODO: as soon as Pango provides a function to check at runtime its
|
#ifdef PANGO_VERSION_MAJOR
|
||||||
// version, we can use it to disable the underline hack for
|
// in Pango >= 1.16 the "underline of leading/trailing spaces" bug has been fixed...
|
||||||
// Pango >= 1.16 as the "underline of leading/trailing spaces"
|
static bool pangoOk = (pango_version_check(1, 16, 1) == NULL);
|
||||||
// has been fixed there
|
#else
|
||||||
bool needshack = underlined;
|
// 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;
|
||||||
char *hackstring = NULL;
|
char *hackstring = NULL;
|
||||||
|
|
||||||
if (needshack)
|
if (needshack)
|
||||||
|
Reference in New Issue
Block a user