added safe check for Pango version and use it to avoid underline hack in wxDC::DrawText() (modified patch 1702301)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1472,11 +1472,11 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
|
||||
return;
|
||||
size_t datalen = strlen(data);
|
||||
|
||||
// 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;
|
||||
// in Pango >= 1.16 the "underline of leading/trailing spaces" bug
|
||||
// has been fixed and thus the hack implemented below should never be used
|
||||
static bool pangoOk = !wx_pango_version_check(1, 16, 0);
|
||||
|
||||
bool needshack = underlined && !pangoOk;
|
||||
char *hackstring = NULL;
|
||||
|
||||
if (needshack)
|
||||
|
Reference in New Issue
Block a user