Do not allow events to fire after socket is closed (fixes crash on GTK with GDK_Input...

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

diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm
index f5fcb1c0074fc9539d59f92a1c9e603c8d622087..b6ee3bf591301e93d35f4570f356e20fd568c7b8 100644 (file)
--- 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
 // Created:     2003/04/01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

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

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


@@ -28,7 +28,8 @@
 #import <AppKit/NSTypesetter.h>
 #import <AppKit/NSImage.h>
 
 #import <AppKit/NSTypesetter.h>
 #import <AppKit/NSImage.h>
 

-#include <wx/listimpl.cpp>
+#include "wx/math.h" //math constants
+#include "wx/listimpl.cpp"

 WX_DEFINE_LIST(wxCocoaDCStack);
 
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 WX_DEFINE_LIST(wxCocoaDCStack);
 
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)


@@ -140,13 +141,13 @@ bool wxDC::CocoaUnwindStackAndTakeFocus()
 
 wxDC::wxDC(void)
 {
 
 wxDC::wxDC(void)
 {

-    m_cocoaFlipped = false;
-    m_cocoaHeight = 0.0;
+    m_cocoaWxToBoundsTransform = nil;

     m_pen = *wxBLACK_PEN;
 }
 
 wxDC::~wxDC(void)
 {
     m_pen = *wxBLACK_PEN;
 }
 
 wxDC::~wxDC(void)
 {

+    [m_cocoaWxToBoundsTransform release];

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


@@ -159,26 +160,49 @@ bool wxDC::CocoaUnlockFocus()
     return false;
 }
 
     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
     // This transform flips the graphics since wxDC uses top-left origin

-    if(!m_cocoaFlipped)
+    if(!isFlipped)

     {
         // The transform is auto released
     {
         // 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
         /*  x' = 1x + 0y + 0
             y' = 0x + -1y + window's height
         */
         NSAffineTransformStruct matrix = {
             1,  0
         ,   0, -1

-        ,   0, m_cocoaHeight
+        ,   0, height

         };
         [transform setTransformStruct: matrix];
         };
         [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::CocoaUnapplyTransformations()
+{
+    // NOTE: You *must* call this with focus held.
+    // Undo all transforms so we're back in true Cocoa coords with
+    // no scaling or flipping.
+    NSAffineTransform *invertTransform;
+    invertTransform = [m_cocoaWxToBoundsTransform copy];
+    [invertTransform invert];
+    [invertTransform concat];
+    [invertTransform release];
+}
+
+bool wxDC::CocoaGetBounds(void *rectData)
+{
+    // We don't know what we are so we can't return anything.
+    return false;

 }
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 }
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)


@@ -342,17 +366,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
 //-----------------------------------------------------------------------------


@@ -549,6 +562,22 @@ void wxDC::SetTextBackground( const wxColour &col )
 
 void wxDC::Clear()
 {
 
 void wxDC::Clear()
 {

+    if(!CocoaTakeFocus()) return;
+
+    NSRect boundsRect;
+    if(!CocoaGetBounds(&boundsRect)) return;
+
+    NSGraphicsContext *context = [NSGraphicsContext currentContext];
+    [context saveGraphicsState];
+
+    // Undo all transforms so when we draw our bounds rect we
+    // really overwrite our bounds rect.
+    CocoaUnapplyTransformations();
+
+    [m_backgroundBrush.GetNSColor() set];
+    [NSBezierPath fillRect:boundsRect];
+
+    [context restoreGraphicsState];

 }
 
 void wxDC::SetBackground(const wxBrush& brush)
 }
 
 void wxDC::SetBackground(const wxBrush& brush)


@@ -636,7 +665,7 @@ void wxDC::ComputeScaleAndOrigin(void)
   {
     // this is a bit artificial, but we need to force wxDC to think
     // the pen has changed
   {
     // 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);
     wxPen tempPen;
     m_pen = tempPen;
     SetPen(* pen);