don't add 7 and 14 pixel horz/vertical padding in DoGetBestSize() when the best size...

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

diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm
index f3f2d3e2d0d23829b8556384762023d9d7282de7..218fb4ff8eedccfb39f61e9f409530de46d6ebe8 100644 (file)
--- a/src/cocoa/dcmemory.mm
+++ b/src/cocoa/dcmemory.mm
@@ -6,10 +6,11 @@
 // Created:     2003/03/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:    wxWidgets licence
+// Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
+
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcmemory.h"
@@ -53,7 +54,10 @@ bool wxMemoryDC::CocoaLockFocus()
     {
         [m_cocoaNSImage lockFocus];
         sm_cocoaDCStack.Insert(this);
-        m_cocoaWxToBoundsTransform = CocoaGetWxToBoundsTransform([m_cocoaNSImage isFlipped], [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;
     }
@@ -100,7 +104,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
             operation: NSCompositeCopy
             fraction: 1.0];
         [m_cocoaNSImage unlockFocus];
-        
+
         [nsimage release];
     }
 }
@@ -146,25 +150,21 @@ bool wxMemoryDC::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
             width, height)
         operation: NSCompositeCopy // FIXME: raster ops
         fraction: 1.0];
-        
+
     [context restoreGraphicsState];
     return false;
 }
 
-void wxMemoryDC::Clear()
+bool wxMemoryDC::CocoaGetBounds(void *rectData)
 {
-    if(!CocoaTakeFocus()) return;
-
-    NSGraphicsContext *context = [NSGraphicsContext currentContext];
-    [context saveGraphicsState];
-
-    [m_backgroundBrush.GetNSColor() set];
-    NSRect rect;
-    rect.origin.x = 0;
-    rect.origin.y = 0;
-    rect.size = [m_cocoaNSImage size];
-    [NSBezierPath fillRect:rect];
-
-    [context restoreGraphicsState];
+    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;
 }