destroying native and wx controls

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

diff --git a/src/cocoa/dcclient.mm b/src/cocoa/dcclient.mm
index cbeed000b59117119b2ff935e78ff906af35e614..c22214c824b220d247296da22fc007a18edd957d 100644 (file)
--- a/src/cocoa/dcclient.mm
+++ b/src/cocoa/dcclient.mm
@@ -51,8 +51,6 @@ 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;
@@ -72,6 +70,10 @@ bool wxWindowDC::CocoaUnlockFocusOnNSView()
 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());
 }
 
@@ -81,17 +83,15 @@ bool wxWindowDC::CocoaUnlockFocus()
     return CocoaUnlockFocusOnNSView();
 }
 
-void wxWindowDC::Clear()
+bool wxWindowDC::CocoaGetBounds(void *rectData)
 {
-    if(!CocoaTakeFocus()) return;
-
-    NSGraphicsContext *context = [NSGraphicsContext currentContext];
-    [context saveGraphicsState];
-
-    [m_backgroundBrush.GetNSColor() set];
-    [NSBezierPath fillRect:[m_lockedNSView bounds]];
-
-    [context restoreGraphicsState];
+    if(!rectData)
+        return false;
+    if(!m_lockedNSView)
+        return false;
+    NSRect *pRect = (NSRect*)rectData;
+    *pRect = [m_lockedNSView bounds];
+    return true;
 }
 
 /*
@@ -116,6 +116,10 @@ wxClientDC::~wxClientDC(void)
 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());
 }
 
@@ -140,8 +144,10 @@ wxPaintDC::wxPaintDC( wxWindow *window )
     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;
+    NSAffineTransform *newTransform = window->CocoaGetWxToBoundsTransform();
+    [newTransform retain];
+    [m_cocoaWxToBoundsTransform release];
+    m_cocoaWxToBoundsTransform = newTransform;
     CocoaApplyTransformations();
 };