Implement Raise()/Lower() using [NSVIew sortSubviewsUsingFunction:context:]

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

diff --git a/src/cocoa/dcclient.mm b/src/cocoa/dcclient.mm
index b1c9429f9a85f2887d8ddebb4030018548704af6..cfa266129a0c411f69be0443173e0339324136ca 100644 (file)
--- a/src/cocoa/dcclient.mm
+++ b/src/cocoa/dcclient.mm
@@ -11,9 +11,14 @@
 
 #include "wx/dcclient.h"
 #include "wx/window.h"
+#include "wx/log.h"
 
 #import <AppKit/NSView.h>
 #import <AppKit/NSAffineTransform.h>
+#import <AppKit/NSColor.h>
+#import <AppKit/NSGraphicsContext.h>
+#import <AppKit/NSBezierPath.h>
+#import <AppKit/NSWindow.h>
 
 /*
  * wxWindowDC
@@ -35,6 +40,19 @@ wxWindowDC::~wxWindowDC(void)
 {
 };
 
+void wxWindowDC::Clear()
+{
+    wxASSERT(m_window);
+
+    NSGraphicsContext *context = [NSGraphicsContext currentContext];
+    [context saveGraphicsState];
+
+    [m_backgroundBrush.GetNSColor() set];
+    [NSBezierPath fillRect:[m_window->GetNSView() bounds]];
+
+    [context restoreGraphicsState];
+}
+
 /*
  * wxClientDC
  */
@@ -45,14 +63,38 @@ wxClientDC::wxClientDC(void)
 };
 
 wxClientDC::wxClientDC( wxWindow *window )
-:   wxWindowDC(window)
 {
+    m_window = window;
 };
 
 wxClientDC::~wxClientDC(void)
 {
+    CocoaUnwindStackAndLoseFocus();
 };
 
+bool wxClientDC::CocoaLockFocus()
+{
+    wxLogDebug("Locking focus on wxClientDC=%p, NSView=%p",this, m_window->GetNSView());
+    if([m_window->GetNSView() lockFocusIfCanDraw])
+    {
+        sm_cocoaDCStack.Insert(this);
+        m_cocoaFlipped = [m_window->GetNSView() isFlipped];
+        m_cocoaHeight = [m_window->GetNSView() bounds].size.height;
+        CocoaApplyTransformations();
+        return true;
+    }
+    wxLogDebug("focus lock failed!");
+    return false;
+}
+
+bool wxClientDC::CocoaUnlockFocus()
+{
+    wxLogDebug("Unlocking focus on wxClientDC=%p, NSView=%p",this, m_window->GetNSView());
+    [[m_window->GetNSView() window] flushWindow];
+    [m_window->GetNSView() unlockFocus];
+    return true;
+}
+
 /*
  * wxPaintDC
  */
@@ -63,30 +105,29 @@ wxPaintDC::wxPaintDC(void)
 };
 
 wxPaintDC::wxPaintDC( wxWindow *window )
-:   wxWindowDC(window)
 {
+    m_window = window;
     wxASSERT_MSG([NSView focusView]==window->GetNSView(), "PaintDC's NSView does not have focus.  Please use wxPaintDC only as the first DC created in a paint handler");
-    // This transform flips the graphics since wxDC uses top-left origin
-    if(![window->GetNSView() isFlipped])
-    {
-        // The transform is auto released
-        NSAffineTransform *transform = [NSAffineTransform transform];
-        /*  x' = 1x + 0y + 0
-            y' = 0x + -1y + window's height
-        */
-        NSAffineTransformStruct matrix = {
-            1,  0
-        ,   0, -1
-        ,   0, [window->GetNSView() bounds].size.height
-        };
-        [transform setTransformStruct: matrix];
-        // Apply the transform 
-        [transform concat];
-    }
-    // TODO: Apply scaling transformation
+    sm_cocoaDCStack.Insert(this);
+    m_cocoaFlipped = [window->GetNSView() isFlipped];
+    m_cocoaHeight = [window->GetNSView() bounds].size.height;
+    CocoaApplyTransformations();
 };
 
 wxPaintDC::~wxPaintDC(void)
 {
+    CocoaUnwindStackAndLoseFocus();
 };
 
+bool wxPaintDC::CocoaLockFocus()
+{
+    wxFAIL_MSG("wxPaintDC cannot be asked to lock focus!");
+    return false;
+}
+
+bool wxPaintDC::CocoaUnlockFocus()
+{
+    // wxPaintDC focus can never be unlocked.
+    return false;
+}
+