X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d630f41d9b30c624f6806b5b6b28aa821d17362a..c77a67962c2f50a872491869fcf1a6c082fdc6c6:/src/cocoa/dcclient.mm?ds=inline diff --git a/src/cocoa/dcclient.mm b/src/cocoa/dcclient.mm index 430f225b10..c22214c824 100644 --- a/src/cocoa/dcclient.mm +++ b/src/cocoa/dcclient.mm @@ -6,14 +6,22 @@ // Created: 2003/04/01 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -#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 #import +#import +#import +#import +#import /* * wxWindowDC @@ -22,19 +30,70 @@ IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC) wxWindowDC::wxWindowDC(void) : m_window(NULL) +, m_lockedNSView(NULL) { }; 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) { + CocoaUnwindStackAndLoseFocus(); }; +bool wxWindowDC::CocoaLockFocusOnNSView(WX_NSView nsview) +{ + if([nsview lockFocusIfCanDraw]) + { + sm_cocoaDCStack.Insert(this); + 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()); + NSAffineTransform *newTransform = CocoaGetWxToBoundsTransform([m_window->GetNonClientNSView() isFlipped], [m_window->GetNonClientNSView() bounds].size.height); + [newTransform retain]; + [m_cocoaWxToBoundsTransform release]; + m_cocoaWxToBoundsTransform = newTransform; + 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(); +} + +bool wxWindowDC::CocoaGetBounds(void *rectData) +{ + if(!rectData) + return false; + if(!m_lockedNSView) + return false; + NSRect *pRect = (NSRect*)rectData; + *pRect = [m_lockedNSView bounds]; + return true; +} + /* * wxClientDC */ @@ -51,8 +110,25 @@ wxClientDC::wxClientDC( wxWindow *window ) wxClientDC::~wxClientDC(void) { + CocoaUnwindStackAndLoseFocus(); }; +bool wxClientDC::CocoaLockFocus() +{ + wxLogTrace(wxTRACE_COCOA,wxT("Locking focus on wxClientDC=%p, NSView=%p"),this, m_window->GetNSView()); + NSAffineTransform *newTransform = m_window->CocoaGetWxToBoundsTransform(); + [newTransform retain]; + [m_cocoaWxToBoundsTransform release]; + m_cocoaWxToBoundsTransform = newTransform; + 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 */ @@ -65,28 +141,30 @@ wxPaintDC::wxPaintDC(void) 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(); + NSAffineTransform *newTransform = window->CocoaGetWxToBoundsTransform(); + [newTransform retain]; + [m_cocoaWxToBoundsTransform release]; + m_cocoaWxToBoundsTransform = newTransform; + CocoaApplyTransformations(); }; 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; +} +