X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/28f3fe51bddd89bf473581eaca1a15c8f3b0e2c5..976f924083419b6a7feb1ff7d597c746a70abf1a:/src/cocoa/dcmemory.mm

diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm
index e097fea9a5..7ce8c835aa 100644
--- a/src/cocoa/dcmemory.mm
+++ b/src/cocoa/dcmemory.mm
@@ -6,12 +6,18 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:   	wxWindows licence
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/dcmemory.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/dcmemory.h"
+#endif //WX_PRECOMP
 
 #import <AppKit/NSImage.h>
+#import <AppKit/NSAffineTransform.h>
+#import <AppKit/NSGraphicsContext.h>
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
@@ -41,8 +47,11 @@ bool wxMemoryDC::CocoaLockFocus()
 {
     if(m_cocoaNSImage)
     {
-        [m_cocoaNSImage lockFocusOnRepresentation: m_selectedBitmap.GetNSBitmapImageRep()];
+        [m_cocoaNSImage lockFocus];
         sm_cocoaDCStack.Insert(this);
+        m_cocoaFlipped = [m_cocoaNSImage isFlipped];
+        m_cocoaHeight = [m_cocoaNSImage size].height;
+        CocoaApplyTransformations();
         return true;
     }
     return false;
@@ -54,18 +63,41 @@ bool wxMemoryDC::CocoaUnlockFocus()
     return true;
 }
 
+// NOTE: The AppKit is unable to draw onto an NSBitmapImageRep so we must
+// instead copy the data to an offscreen window, then copy it back
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
+    if(m_selectedBitmap.Ok())
+    {
+        CocoaTakeFocus();
+        wxASSERT(m_cocoaNSImage);
+        m_selectedBitmap.SetNSBitmapImageRep(
+            [[NSBitmapImageRep alloc]
+                initWithFocusedViewRect:NSMakeRect(0.0,0.0,
+                    m_selectedBitmap.GetWidth(),
+                    m_selectedBitmap.GetHeight())]);
+    }
     CocoaUnwindStackAndLoseFocus();
     [m_cocoaNSImage release];
     m_cocoaNSImage = nil;
     m_selectedBitmap = bitmap;
     if(m_selectedBitmap.Ok())
     {
+        // Create an offscreen window of the same size
         m_cocoaNSImage = [[NSImage alloc]
                 initWithSize:NSMakeSize(m_selectedBitmap.GetWidth(),
                     m_selectedBitmap.GetHeight())];
-        [m_cocoaNSImage addRepresentation: m_selectedBitmap.GetNSBitmapImageRep()];
+
+        // Now copy the data
+        NSImage *nsimage = [m_selectedBitmap.GetNSImage(false) retain];
+        [m_cocoaNSImage lockFocus];
+        [nsimage drawAtPoint: NSMakePoint(0,0)
+            fromRect: NSMakeRect(0.0,0.0,m_selectedBitmap.GetWidth(),m_selectedBitmap.GetHeight())
+            operation: NSCompositeCopy
+            fraction: 1.0];
+        [m_cocoaNSImage unlockFocus];
+        
+        [nsimage release];
     }
 }
 
@@ -77,3 +109,41 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
         *height = m_selectedBitmap.GetHeight();
 }
 
+bool wxMemoryDC::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
+    wxCoord width, wxCoord height, wxCoord xsrc, wxCoord ysrc,
+    int logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask)
+{
+    if(!m_selectedBitmap.Ok())
+        return false;
+
+    NSAffineTransform *transform = [NSAffineTransform transform];
+    [transform translateXBy:xdest yBy:ydest];
+
+    NSAffineTransform *flipTransform = [NSAffineTransform transform];
+    /*  x' = 1x + 0y + 0
+        y' = 0x + -1y + window's height
+    */
+    NSAffineTransformStruct matrix = {
+        1,  0
+    ,   0, -1
+    ,   0, height
+    };
+    [flipTransform setTransformStruct: matrix];
+
+    NSGraphicsContext *context = [NSGraphicsContext currentContext];
+    [context saveGraphicsState];
+    [transform concat];
+    [flipTransform concat];
+
+    wxLogTrace(wxTRACE_COCOA,wxT("[m_cocoaNSImage isFlipped]=%d"), [m_cocoaNSImage isFlipped]);
+    [m_cocoaNSImage drawAtPoint: NSMakePoint(0,0)
+        fromRect: NSMakeRect(xsrc,
+            m_selectedBitmap.GetHeight()-height-ysrc,
+            width, height)
+        operation: NSCompositeCopy // FIXME: raster ops
+        fraction: 1.0];
+        
+    [context restoreGraphicsState];
+    return false;
+}
+