From 16601713a4194e5a422d31cc076213bdf96b60af Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Tue, 23 Sep 2014 16:37:15 +0000 Subject: [PATCH] cairo_image_surface_get_{width,height} have been available in cairo since version 1.0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/graphicc.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index 7d873ee925..7a380f23d0 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -1328,13 +1328,8 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, cairo_surfac m_surface = bitmap; m_pattern = cairo_pattern_create_for_surface(m_surface); -#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,11,0) - if ( cairo_version() >= CAIRO_VERSION_ENCODE(1, 11, 0) ) - { - m_width = cairo_image_surface_get_width(m_surface); - m_height = cairo_image_surface_get_height(m_surface); - } -#endif + m_width = cairo_image_surface_get_width(m_surface); + m_height = cairo_image_surface_get_height(m_surface); m_buffer = NULL; }