From bd45a79a99bfb90936a2e48662801b4fee848e46 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 24 Feb 2014 08:17:15 +0000 Subject: [PATCH] using old code for carbon only, new code for cocoa, fixing doubly apply flip of y axis git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/graphics.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index 0be23e06ca..d4bbc310f2 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -2250,23 +2250,21 @@ void wxMacCoreGraphicsContext::DrawIcon( const wxIcon &icon, wxDouble x, wxDoubl if (m_composition == wxCOMPOSITION_DEST) return; +#if wxOSX_USE_CARBON CGContextSaveGState( m_cgContext ); CGContextTranslateCTM( m_cgContext,(CGFloat) x ,(CGFloat) (y + h) ); CGContextScaleCTM( m_cgContext, 1, -1 ); -#if wxOSX_USE_COCOA_OR_CARBON -#if 1 CGRect r = CGRectMake( (CGFloat) 0.0 , (CGFloat) 0.0 , (CGFloat) w , (CGFloat) h ); PlotIconRefInContext( m_cgContext , &r , kAlignNone , kTransformNone , NULL , kPlotIconRefNormalFlags , icon.GetHICON() ); -#else - CGRect r = CGRectMake( (CGFloat) 0.0 , (CGFloat) 0.0 , (CGFloat) w , (CGFloat) h ); + CGContextRestoreGState( m_cgContext ); +#elif wxOSX_USE_COCOA + CGRect r = CGRectMake( (CGFloat) x , (CGFloat) y , (CGFloat) w , (CGFloat) h ); const WX_NSImage nsImage = icon.GetNSImage(); CGImageRef cgImage = wxOSXGetCGImageFromNSImage( nsImage , &r, m_cgContext ); wxMacDrawCGImage( m_cgContext, &r, cgImage); #endif -#endif - CGContextRestoreGState( m_cgContext ); CheckInvariants(); }