From 7d6abbffb823e6e9f45c34c1791c35b6288c5d4c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 23 Sep 2014 17:44:39 +0000 Subject: [PATCH] merge to independent preprocessor to one check. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/graphicc.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/generic/graphicc.cpp b/src/generic/graphicc.cpp index a42d91da23..f328677524 100644 --- a/src/generic/graphicc.cpp +++ b/src/generic/graphicc.cpp @@ -1748,9 +1748,7 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& cairo_t* cr = static_cast(dc.GetImpl()->GetCairoContext()); if ( cr ) Init(cairo_reference(cr)); -#endif - -#ifdef __WXMAC__ +#elif defined(__WXMAC__) CGContextRef cgcontext = (CGContextRef)dc.GetWindow()->MacGetCGContextRef(); cairo_surface_t* surface = cairo_quartz_surface_create_for_cg_context(cgcontext, width, height); Init( cairo_create( surface ) );