diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index 1f6b875613..0e644ce02a 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -2013,9 +2013,10 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& // bug 96482) so in this case we would need to pass non-transformed // DC to Cairo and to apply original DC transformation to the Cairo // context operations on our own. - // We believe this bug will be fixed in the next Cairo version. -#if CAIRO_VERSION <= CAIRO_VERSION_ENCODE(1, 15, 2) - if ( cairo_version() <= CAIRO_VERSION_ENCODE(1, 15, 2) ) + // Bug 96482 was fixed in Cairo 1.15.12 so this workaround needs + // to be applied only for older Cairo versions. +#if CAIRO_VERSION < CAIRO_VERSION_ENCODE(1, 15, 12) + if ( cairo_version() < CAIRO_VERSION_ENCODE(1, 15, 12) ) { wxCoord orgX, orgY; dc.GetDeviceOrigin(&orgX, &orgY); @@ -2028,7 +2029,7 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& adjustTransformFromDC = true; } } -#endif // Cairo <= 1.15.2 +#endif // Cairo < 1.15.12 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 15, 4) if ( cairo_version() >= CAIRO_VERSION_ENCODE(1, 15, 4) )