Restore a use case that was lost with the last set of updates, using a

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

diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm
index 7ef93f80ee6e2b85d823325a75bde249ef2e9df3..7541eaf8c32b1494934796db36f6038ddda6213b 100644 (file)
--- a/src/cocoa/dc.mm
+++ b/src/cocoa/dc.mm
@@ -6,13 +6,16 @@
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

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

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

+
+#include "wx/dc.h"
+

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

-    #include "wx/dc.h"
+    #include "wx/math.h" //math constants

 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"
 #endif //WX_PRECOMP
 
 #include "wx/cocoa/autorelease.h"


@@ -146,6 +149,7 @@ wxDC::wxDC(void)
 
 wxDC::~wxDC(void)
 {
 
 wxDC::~wxDC(void)
 {

+    [m_cocoaWxToBoundsTransform release];

 }
 
 bool wxDC::CocoaLockFocus()
 }
 
 bool wxDC::CocoaLockFocus()


@@ -194,6 +198,7 @@ void wxDC::CocoaUnapplyTransformations()
     invertTransform = [m_cocoaWxToBoundsTransform copy];
     [invertTransform invert];
     [invertTransform concat];
     invertTransform = [m_cocoaWxToBoundsTransform copy];
     [invertTransform invert];
     [invertTransform concat];

+    [invertTransform release];

 }
 
 bool wxDC::CocoaGetBounds(void *rectData)
 }
 
 bool wxDC::CocoaGetBounds(void *rectData)


@@ -363,17 +368,6 @@ int wxDCBase::LogicalToDeviceYRel(int y) const
 // cut here, the rest is stubs
 ///////////////////////////////////////////////////////////////////////////
 
 // cut here, the rest is stubs
 ///////////////////////////////////////////////////////////////////////////
 

-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-#define mm2inches              0.0393700787402
-#define inches2mm              25.4
-#define mm2twips               56.6929133859
-#define twips2mm               0.0176388888889
-#define mm2pt                  2.83464566929
-#define pt2mm                  0.352777777778
-

 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------


@@ -382,8 +376,8 @@ void wxDC::DoDrawIcon( const wxIcon &WXUNUSED(icon), int WXUNUSED(x), int WXUNUS
 {
 };
 
 {
 };
 

-void wxDC::DoDrawPoint( int x, int y ) 
-{ 
+void wxDC::DoDrawPoint( int x, int y )
+{

 };
 
 void wxDC::DoDrawPolygon( int, wxPoint *, int, int, int)
 };
 
 void wxDC::DoDrawPolygon( int, wxPoint *, int, int, int)


@@ -432,7 +426,7 @@ bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc)
 {
 }
 void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc)
 {
 }

-    
+

 void wxDC::SetPen(const wxPen& pen)
 {
     m_pen = pen;
 void wxDC::SetPen(const wxPen& pen)
 {
     m_pen = pen;


@@ -513,7 +507,7 @@ void wxDC::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask)
         fromRect: NSMakeRect(0.0,0.0,bmp.GetWidth(),bmp.GetHeight())
         operation: NSCompositeSourceOver
         fraction: 1.0];
         fromRect: NSMakeRect(0.0,0.0,bmp.GetWidth(),bmp.GetHeight())
         operation: NSCompositeSourceOver
         fraction: 1.0];

-        
+

     [nsimage release];
     [context restoreGraphicsState];
 }
     [nsimage release];
     [context restoreGraphicsState];
 }


@@ -604,7 +598,7 @@ void wxDC::SetLogicalFunction(int)
 
 void wxDC::SetMapMode( int mode )
 {
 
 void wxDC::SetMapMode( int mode )
 {

-  switch (mode) 
+  switch (mode)

   {
     case wxMM_TWIPS:
       break;
   {
     case wxMM_TWIPS:
       break;


@@ -668,7 +662,7 @@ void wxDC::ComputeScaleAndOrigin(void)
   m_scaleX = m_logicalScaleX * m_userScaleX;
   m_scaleY = m_logicalScaleY * m_userScaleY;
 
   m_scaleX = m_logicalScaleX * m_userScaleX;
   m_scaleY = m_logicalScaleY * m_userScaleY;
 

-  // CMB: if scale has changed call SetPen to recalulate the line width 
+  // CMB: if scale has changed call SetPen to recalulate the line width

   if (m_scaleX != origScaleX || m_scaleY != origScaleY)
   {
     // this is a bit artificial, but we need to force wxDC to think
   if (m_scaleX != origScaleX || m_scaleY != origScaleY)
   {
     // this is a bit artificial, but we need to force wxDC to think


@@ -679,4 +673,3 @@ void wxDC::ComputeScaleAndOrigin(void)
     SetPen(* pen);
   }
 };
     SetPen(* pen);
   }
 };

-