X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/48580976469f7c46b730f96effacfa680e55e3cd..83dee24ca2b182a77740d33abf72b833e647bcd5:/src/cocoa/dc.mm

diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm
index 3a0e7c3657..da2d539def 100644
--- a/src/cocoa/dc.mm
+++ b/src/cocoa/dc.mm
@@ -6,7 +6,7 @@
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
-// Licence:   	wxWindows license
+// Licence:   	wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
@@ -28,7 +28,7 @@
 #import <AppKit/NSTypesetter.h>
 #import <AppKit/NSImage.h>
 
-#include <wx/listimpl.cpp>
+#include "wx/listimpl.cpp"
 WX_DEFINE_LIST(wxCocoaDCStack);
 
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
@@ -98,10 +98,10 @@ void wxDC::CocoaShutdownTextSystem()
 
 void wxDC::CocoaUnwindStackAndLoseFocus()
 {
-    wxCocoaDCStack::Node *ourNode=sm_cocoaDCStack.Find(this);
+    wxCocoaDCStack::compatibility_iterator ourNode=sm_cocoaDCStack.Find(this);
     if(ourNode)
     {
-        wxCocoaDCStack::Node *node=sm_cocoaDCStack.GetFirst();
+        wxCocoaDCStack::compatibility_iterator node=sm_cocoaDCStack.GetFirst();
         for(;node!=ourNode; node=sm_cocoaDCStack.GetFirst())
         {
             wxDC *dc = node->GetData();
@@ -111,18 +111,18 @@ void wxDC::CocoaUnwindStackAndLoseFocus()
             {
                 wxFAIL_MSG(wxT("Unable to unlock focus on higher-level DC!"));
             }
-            sm_cocoaDCStack.DeleteNode(node);
+            sm_cocoaDCStack.Erase(node);
         }
         wxASSERT(node==ourNode);
         wxASSERT(ourNode->GetData() == this);
         ourNode->GetData()->CocoaUnlockFocus();
-        sm_cocoaDCStack.DeleteNode(ourNode);
+        sm_cocoaDCStack.Erase(ourNode);
     }
 }
 
 bool wxDC::CocoaUnwindStackAndTakeFocus()
 {
-    wxCocoaDCStack::Node *node=sm_cocoaDCStack.GetFirst();
+    wxCocoaDCStack::compatibility_iterator node=sm_cocoaDCStack.GetFirst();
     for(;node;node = sm_cocoaDCStack.GetFirst())
     {
         wxDC *dc = node->GetData();
@@ -133,15 +133,14 @@ bool wxDC::CocoaUnwindStackAndTakeFocus()
         // If unable to unlockFocus (e.g. wxPaintDC) stop here
         if(!dc->CocoaUnlockFocus())
             break;
-        sm_cocoaDCStack.DeleteNode(node);
+        sm_cocoaDCStack.Erase(node);
     }
     return CocoaLockFocus();
 }
 
 wxDC::wxDC(void)
 {
-    m_cocoaFlipped = false;
-    m_cocoaHeight = 0.0;
+    m_cocoaWxToBoundsTransform = nil;
     m_pen = *wxBLACK_PEN;
 }
 
@@ -159,30 +158,36 @@ bool wxDC::CocoaUnlockFocus()
     return false;
 }
 
-void wxDC::CocoaApplyTransformations()
+/*static*/ WX_NSAffineTransform wxDC::CocoaGetWxToBoundsTransform(bool isFlipped, float height)
 {
+    NSAffineTransform *transform = nil;
     // This transform flips the graphics since wxDC uses top-left origin
-    if(!m_cocoaFlipped)
+    if(!isFlipped)
     {
         // The transform is auto released
-        NSAffineTransform *transform = [NSAffineTransform transform];
+        transform = [NSAffineTransform transform];
         /*  x' = 1x + 0y + 0
             y' = 0x + -1y + window's height
         */
         NSAffineTransformStruct matrix = {
             1,  0
         ,   0, -1
-        ,   0, m_cocoaHeight
+        ,   0, height
         };
         [transform setTransformStruct: matrix];
-        // Apply the transform 
-        [transform concat];
     }
-    // TODO: Apply scaling transformation
+    return transform;
+}
+
+void wxDC::CocoaApplyTransformations()
+{
+    [m_cocoaWxToBoundsTransform concat];
+    // TODO: Apply device/logical/user position/scaling transformations
 }
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
+    wxAutoNSAutoreleasePool pool;
     if(!CocoaTakeFocus()) return;
     NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:NSMakeRect(x,y,width,height)];
     CocoaSetPenForNSBezierPath(m_pen,bezpath);
@@ -193,6 +198,7 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 
 void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
+    wxAutoNSAutoreleasePool pool;
     if(!CocoaTakeFocus()) return;
     NSBezierPath *bezpath = [NSBezierPath bezierPath];
     [bezpath moveToPoint:NSMakePoint(x1,y1)];
@@ -226,6 +232,7 @@ void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord
 
 void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
 {
+    wxAutoNSAutoreleasePool pool;
     if(!CocoaTakeFocus()) return;
     wxASSERT_MSG(sm_cocoaNSTextStorage && sm_cocoaNSLayoutManager && sm_cocoaNSTextContainer, wxT("Text system has not been initialized.  BAD PROGRAMMER!"));
     NSAttributedString *attributedString = [[NSAttributedString alloc]
@@ -449,6 +456,7 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 
 void wxDC::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask)
 {
+    wxAutoNSAutoreleasePool pool;
     if(!CocoaTakeFocus()) return;
     if(!bmp.Ok())
         return;
@@ -632,7 +640,7 @@ void wxDC::ComputeScaleAndOrigin(void)
   {
     // this is a bit artificial, but we need to force wxDC to think
     // the pen has changed
-    wxPen* pen = & GetPen();
+    const wxPen* pen = & GetPen();
     wxPen tempPen;
     m_pen = tempPen;
     SetPen(* pen);