added our own implementation of strto[u]ll() if the system doesn't have one (patch...

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

diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm
index ff5882d9955c878cadb36957a92011cf40c6cf4a..b6de98c88050a0f29945dbc116e2d2df4887d822 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
 // Created:     2003/03/16
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott

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

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

+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcmemory.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/dcmemory.h"


@@ -29,7 +30,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxDC)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxDC)
 

-wxMemoryDC::wxMemoryDC(void)
+void wxMemoryDC::Init()

 {
     m_cocoaNSImage = NULL;
     m_ok = false;
 {
     m_cocoaNSImage = NULL;
     m_ok = false;


@@ -37,8 +38,7 @@ wxMemoryDC::wxMemoryDC(void)
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 {
 
 wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
 {

-    m_cocoaNSImage = NULL;
-    m_ok = false;
+    Init();

 }
 
 wxMemoryDC::~wxMemoryDC(void)
 }
 
 wxMemoryDC::~wxMemoryDC(void)


@@ -53,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;
     }


@@ -69,7 +71,7 @@ bool wxMemoryDC::CocoaUnlockFocus()
 
 // 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
 
 // 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 )
+void wxMemoryDC::DoSelect( const wxBitmap& bitmap )

 {
     wxAutoNSAutoreleasePool pool;
     if(m_selectedBitmap.Ok())
 {
     wxAutoNSAutoreleasePool pool;
     if(m_selectedBitmap.Ok())


@@ -101,7 +103,7 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
             operation: NSCompositeCopy
             fraction: 1.0];
         [m_cocoaNSImage unlockFocus];
             operation: NSCompositeCopy
             fraction: 1.0];
         [m_cocoaNSImage unlockFocus];

-        
+

         [nsimage release];
     }
 }
         [nsimage release];
     }
 }


@@ -147,25 +149,21 @@ bool wxMemoryDC::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
             width, height)
         operation: NSCompositeCopy // FIXME: raster ops
         fraction: 1.0];
             width, height)
         operation: NSCompositeCopy // FIXME: raster ops
         fraction: 1.0];

-        
+

     [context restoreGraphicsState];
     return false;
 }
 
     [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;

 }
 
 }