reverting drawing code

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

diff --git a/src/cocoa/dcclient.mm b/src/cocoa/dcclient.mm
index b64c2ac01cf19fa984e33b53927b441796626801..2f2f8ddf59a053efed8285d05ade0260b2d5dda0 100644 (file)
--- a/src/cocoa/dcclient.mm
+++ b/src/cocoa/dcclient.mm
@@ -9,14 +9,19 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/dcclient.h"
-#include "wx/window.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/window.h"
+    #include "wx/dcclient.h"
+#endif //WX_PRECOMP

 
 #import <AppKit/NSView.h>
 #import <AppKit/NSAffineTransform.h>
 #import <AppKit/NSColor.h>
 #import <AppKit/NSGraphicsContext.h>
 #import <AppKit/NSBezierPath.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
 
 /*
  * wxWindowDC


@@ -25,28 +30,66 @@ IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 
 wxWindowDC::wxWindowDC(void)
 :   m_window(NULL)
 
 wxWindowDC::wxWindowDC(void)
 :   m_window(NULL)

+,   m_lockedNSView(NULL)

 {
 };
 
 wxWindowDC::wxWindowDC( wxWindow *window )
 :   m_window(window)
 {
 };
 
 wxWindowDC::wxWindowDC( wxWindow *window )
 :   m_window(window)

+,   m_lockedNSView(NULL)

 {
 {

-    wxFAIL_MSG("non-client window DC's are not supported");
+    wxLogDebug(wxT("non-client window DC's are not supported, oh well"));

 };
 
 wxWindowDC::~wxWindowDC(void)
 {
 };
 
 wxWindowDC::~wxWindowDC(void)
 {

+    CocoaUnwindStackAndLoseFocus();

 };
 
 };
 

+bool wxWindowDC::CocoaLockFocusOnNSView(WX_NSView nsview)
+{
+    if([nsview lockFocusIfCanDraw])
+    {
+        sm_cocoaDCStack.Insert(this);
+        m_cocoaFlipped = [nsview isFlipped];
+        m_cocoaHeight = [nsview bounds].size.height;
+        CocoaApplyTransformations();
+        m_lockedNSView = nsview;
+        return true;
+    }
+    wxLogDebug(wxT("focus lock failed!"));
+    return false;
+}
+
+bool wxWindowDC::CocoaUnlockFocusOnNSView()
+{
+    [[m_lockedNSView window] flushWindow];
+    [m_lockedNSView unlockFocus];
+    m_lockedNSView = NULL;
+    return true;
+}
+
+bool wxWindowDC::CocoaLockFocus()
+{
+    wxLogTrace(wxTRACE_COCOA,wxT("Locking focus on wxWindowDC=%p, NSView=%p"),this, m_window->GetNonClientNSView());
+    return CocoaLockFocusOnNSView(m_window->GetNonClientNSView());
+}
+
+bool wxWindowDC::CocoaUnlockFocus()
+{
+    wxLogTrace(wxTRACE_COCOA,wxT("Unlocking focus on wxWindowDC=%p, NSView=%p"),this, m_window->GetNonClientNSView());
+    return CocoaUnlockFocusOnNSView();
+}
+

 void wxWindowDC::Clear()
 {
 void wxWindowDC::Clear()
 {

-    wxASSERT(m_window);
+    if(!CocoaTakeFocus()) return;

 
     NSGraphicsContext *context = [NSGraphicsContext currentContext];
     [context saveGraphicsState];
 
     [m_backgroundBrush.GetNSColor() set];
 
     NSGraphicsContext *context = [NSGraphicsContext currentContext];
     [context saveGraphicsState];
 
     [m_backgroundBrush.GetNSColor() set];

-    [NSBezierPath fillRect:[m_window->GetNSView() bounds]];
+    [NSBezierPath fillRect:[m_lockedNSView bounds]];

 
     [context restoreGraphicsState];
 }
 
     [context restoreGraphicsState];
 }


@@ -67,8 +110,21 @@ wxClientDC::wxClientDC( wxWindow *window )
 
 wxClientDC::~wxClientDC(void)
 {
 
 wxClientDC::~wxClientDC(void)
 {

+    CocoaUnwindStackAndLoseFocus();

 };
 
 };
 

+bool wxClientDC::CocoaLockFocus()
+{
+    wxLogTrace(wxTRACE_COCOA,wxT("Locking focus on wxClientDC=%p, NSView=%p"),this, m_window->GetNSView());
+    return CocoaLockFocusOnNSView(m_window->GetNSView());
+}
+
+bool wxClientDC::CocoaUnlockFocus()
+{
+    wxLogTrace(wxTRACE_COCOA,wxT("Unlocking focus on wxClientDC=%p, NSView=%p"),this, m_window->GetNSView());
+    return CocoaUnlockFocusOnNSView();
+}
+

 /*
  * wxPaintDC
  */
 /*
  * wxPaintDC
  */


@@ -81,28 +137,28 @@ wxPaintDC::wxPaintDC(void)
 wxPaintDC::wxPaintDC( wxWindow *window )
 {
     m_window = window;
 wxPaintDC::wxPaintDC( wxWindow *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
+    wxASSERT_MSG([NSView focusView]==window->GetNSView(), wxT("PaintDC's NSView does not have focus.  Please use wxPaintDC only as the first DC created in a paint handler"));
+    sm_cocoaDCStack.Insert(this);
+    m_lockedNSView = window->GetNSView();
+    m_cocoaFlipped = [window->GetNSView() isFlipped];
+    m_cocoaHeight = [window->GetNSView() bounds].size.height;
+    CocoaApplyTransformations();

 };
 
 wxPaintDC::~wxPaintDC(void)
 {
 };
 
 wxPaintDC::~wxPaintDC(void)
 {

+    CocoaUnwindStackAndLoseFocus();

 };
 
 };
 

+bool wxPaintDC::CocoaLockFocus()
+{
+    wxFAIL_MSG(wxT("wxPaintDC cannot be asked to lock focus!"));
+    return false;
+}
+
+bool wxPaintDC::CocoaUnlockFocus()
+{
+    // wxPaintDC focus can never be unlocked.
+    return false;
+}
+