reverting drawing code

[wxWidgets.git] / src / cocoa / dcmemory.mm

diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm
index 02efda166f9bf671a621eeb1acd3cca930a61847..dc526fba9c8d8702efbb43cbfea5a3a561ad01dd 100644 (file)
--- a/src/cocoa/dcmemory.mm
+++ b/src/cocoa/dcmemory.mm
@@ -9,8 +9,11 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/dcmemory.h"
-#include "wx/log.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>
@@ -44,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;
@@ -57,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];
     }
 }
 
@@ -106,7 +135,7 @@ bool wxMemoryDC::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
     [transform concat];
     [flipTransform concat];
 
-    wxLogDebug("[m_cocoaNSImage isFlipped]=%d", [m_cocoaNSImage isFlipped]);
+    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,