correcting last commit

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

diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm
index dc526fba9c8d8702efbb43cbfea5a3a561ad01dd..0f2f04c365e862307df8a0f9e2c9396cc0b6fc1b 100644 (file)
--- a/src/cocoa/dcmemory.mm
+++ b/src/cocoa/dcmemory.mm
@@ -6,7 +6,7 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
 // Created:     2003/03/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott

-// Licence:    wxWindows licence
+// Licence:    wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -15,9 +15,13 @@
     #include "wx/dcmemory.h"
 #endif //WX_PRECOMP
 
     #include "wx/dcmemory.h"
 #endif //WX_PRECOMP
 

+#include "wx/cocoa/autorelease.h"
+

 #import <AppKit/NSImage.h>
 #import <AppKit/NSAffineTransform.h>
 #import <AppKit/NSGraphicsContext.h>
 #import <AppKit/NSImage.h>
 #import <AppKit/NSAffineTransform.h>
 #import <AppKit/NSGraphicsContext.h>

+#import <AppKit/NSColor.h>
+#import <AppKit/NSBezierPath.h>

 
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 
 //-----------------------------------------------------------------------------
 // wxMemoryDC


@@ -49,8 +53,10 @@ bool wxMemoryDC::CocoaLockFocus()
     {
         [m_cocoaNSImage lockFocus];
         sm_cocoaDCStack.Insert(this);
     {
         [m_cocoaNSImage lockFocus];
         sm_cocoaDCStack.Insert(this);

-        m_cocoaFlipped = [m_cocoaNSImage isFlipped];
-        m_cocoaHeight = [m_cocoaNSImage size].height;
+        NSAffineTransform *newTransform = CocoaGetWxToBoundsTransform([m_cocoaNSImage isFlipped], [m_cocoaNSImage size].height);
+        [newTransform retain];
+        [m_cocoaWxToBoundsTransform release];
+        m_cocoaWxToBoundsTransform = newTransform;

         CocoaApplyTransformations();
         return true;
     }
         CocoaApplyTransformations();
         return true;
     }


@@ -67,6 +73,7 @@ bool wxMemoryDC::CocoaUnlockFocus()
 // instead copy the data to an offscreen window, then copy it back
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {
 // instead copy the data to an offscreen window, then copy it back
 void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
 {

+    wxAutoNSAutoreleasePool pool;

     if(m_selectedBitmap.Ok())
     {
         CocoaTakeFocus();
     if(m_selectedBitmap.Ok())
     {
         CocoaTakeFocus();


@@ -147,3 +154,16 @@ bool wxMemoryDC::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
     return false;
 }
 
     return false;
 }
 

+bool wxMemoryDC::CocoaGetBounds(void *rectData)
+{
+    if(!rectData)
+        return false;
+    if(!m_cocoaNSImage)
+        return false;
+    NSRect *pRect = (NSRect*)rectData;
+    pRect->origin.x = 0.0;
+    pRect->origin.y = 0.0;
+    pRect->size = [m_cocoaNSImage size];
+    return true;
+}
+