add fix for 32 bit builds, also when wx is drawing CGContextRef is always flipped

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-02-24 08:10:26 +00:00
parent 5c32565ef1
commit c8b105a5f5
1 changed files with 3 additions and 2 deletions
--- a/src/osx/carbon/utilscocoa.mm
+++ b/src/osx/carbon/utilscocoa.mm
@@ -456,8 +456,9 @@ WX_NSImage WXDLLIMPEXP_CORE wxOSXGetNSImageFromIconRef( WXHICON iconref )

 CGImageRef WXDLLIMPEXP_CORE wxOSXGetCGImageFromNSImage( WX_NSImage nsimage, CGRect* r, CGContextRef cg)
 {
-    return [nsimage CGImageForProposedRect:r
-                                   context:[NSGraphicsContext graphicsContextWithGraphicsPort:cg flipped:NO]
+    NSRect nsRect = NSRectFromCGRect(*r);
+    return [nsimage CGImageForProposedRect:&nsRect
+                                   context:[NSGraphicsContext graphicsContextWithGraphicsPort:cg flipped:YES]
                                            hints:nil];
 }