Moved Clear() implementation into wxDC using a new virtual CocoaGetBounds()

to determine the rect to clear.  Also added CocoaUnapplyTransformations()
to bring the coordinate system back into Cocoa coordinates for those
cases such as Clear() where it makes more sense.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/dc.h b/include/wx/cocoa/dc.h
index ed39d574e9ba394cfea941e393fb40cf34d4de4d..c9cc2250429866d13616dcb05dfd273e32df8595 100644 (file)
--- a/include/wx/cocoa/dc.h
+++ b/include/wx/cocoa/dc.h
@@ -58,7 +58,12 @@ protected:
     void CocoaUnwindStackAndLoseFocus();
 // DC flipping/transformation
     void CocoaApplyTransformations();
+    void CocoaUnapplyTransformations();
     WX_NSAffineTransform m_cocoaWxToBoundsTransform;
+// Get bounds rect (for Clear())
+    // note: we use void * to mean NSRect * so that we can avoid
+    // putting NSRect in the headers.
+    virtual bool CocoaGetBounds(void *rectData);
 // Blitting
     virtual bool CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
         wxCoord width, wxCoord height, wxCoord xsrc, wxCoord ysrc,

diff --git a/include/wx/cocoa/dcclient.h b/include/wx/cocoa/dcclient.h
index b7c56ab4129b4312a017189e8f46fb19937db853..5bfc6a15e98661ff7d74955d43e358edf2ff0d3c 100644 (file)
--- a/include/wx/cocoa/dcclient.h
+++ b/include/wx/cocoa/dcclient.h
@@ -27,8 +27,6 @@ public:
     wxWindowDC(wxWindow *win);
     ~wxWindowDC(void);
 
-    // NSView specific functions
-    virtual void Clear();
 protected:
     wxWindow *m_window;
     WX_NSView m_lockedNSView;
@@ -37,6 +35,7 @@ protected:
     virtual bool CocoaUnlockFocus();
     bool CocoaLockFocusOnNSView(WX_NSView nsview);
     bool CocoaUnlockFocusOnNSView();
+    virtual bool CocoaGetBounds(void *rectData);
 };
 
 class wxClientDC: public wxWindowDC

diff --git a/include/wx/cocoa/dcmemory.h b/include/wx/cocoa/dcmemory.h
index 1265fb84dddf66e3c3e2e71fb67c2239a8edaf6f..889b5ce9bd99333bf647bc77d675c48f9109ac36 100644 (file)
--- a/include/wx/cocoa/dcmemory.h
+++ b/include/wx/cocoa/dcmemory.h
@@ -23,14 +23,13 @@ public:
     ~wxMemoryDC(void);
     virtual void SelectObject(const wxBitmap& bitmap);
     virtual void DoGetSize(int *width, int *height) const;
-
-    virtual void Clear();
 protected:
     wxBitmap m_selectedBitmap;
     WX_NSImage m_cocoaNSImage;
 // DC stack
     virtual bool CocoaLockFocus();
     virtual bool CocoaUnlockFocus();
+    virtual bool CocoaGetBounds(void *rectData);
 // Blitting
     virtual bool CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
         wxCoord width, wxCoord height, wxCoord xsrc, wxCoord ysrc,

diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm
index da2d539def056d9822a5a940d008e7dc3a0f9c74..7ef93f80ee6e2b85d823325a75bde249ef2e9df3 100644 (file)
--- a/src/cocoa/dc.mm
+++ b/src/cocoa/dc.mm
@@ -185,6 +185,23 @@ void wxDC::CocoaApplyTransformations()
     // 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];
+}
+
+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)
 {
     wxAutoNSAutoreleasePool pool;
@@ -553,6 +570,22 @@ void wxDC::SetTextBackground( const wxColour &col )
 
 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)

diff --git a/src/cocoa/dcclient.mm b/src/cocoa/dcclient.mm
index bcf82d7aab6e5a75b4bf930da8b08d40e0c72865..d6ca05bc5e0af6d82791eb1d50098bcc29d3cc30 100644 (file)
--- a/src/cocoa/dcclient.mm
+++ b/src/cocoa/dcclient.mm
@@ -80,17 +80,15 @@ bool wxWindowDC::CocoaUnlockFocus()
     return CocoaUnlockFocusOnNSView();
 }
 
-void wxWindowDC::Clear()
-{
-    if(!CocoaTakeFocus()) return;
-
-    NSGraphicsContext *context = [NSGraphicsContext currentContext];
-    [context saveGraphicsState];
-
-    [m_backgroundBrush.GetNSColor() set];
-    [NSBezierPath fillRect:[m_lockedNSView bounds]];
-
-    [context restoreGraphicsState];
+bool wxWindowDC::CocoaGetBounds(void *rectData)
+{
+    if(!rectData)
+        return false;
+    if(!m_lockedNSView)
+        return false;
+    NSRect *pRect = (NSRect*)rectData;
+    *pRect = [m_lockedNSView bounds];
+    return true;
 }
 
 /*

diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm
index f3f2d3e2d0d23829b8556384762023d9d7282de7..fb11593b35d9c60cd869eda171f73b93157ff561 100644 (file)
--- a/src/cocoa/dcmemory.mm
+++ b/src/cocoa/dcmemory.mm
@@ -151,20 +151,16 @@ bool wxMemoryDC::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest,
     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;
 }