Don't depend on m_cocoaWxToBoundsTransform not being released until after

we're done with it; retain/release it appropriately.

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

diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm
index b74aa7bbf7cd51ab10628bf90cd0dacbde08169a..94578291b67e48acd410da413fb94c3f1db66678 100644 (file)
--- a/src/cocoa/dc.mm
+++ b/src/cocoa/dc.mm
@@ -146,6 +146,7 @@ wxDC::wxDC(void)
 
 wxDC::~wxDC(void)
 {
 
 wxDC::~wxDC(void)
 {

+    [m_cocoaWxToBoundsTransform release];

 }
 
 bool wxDC::CocoaLockFocus()
 }
 
 bool wxDC::CocoaLockFocus()

diff --git a/src/cocoa/dcclient.mm b/src/cocoa/dcclient.mm
index d6ca05bc5e0af6d82791eb1d50098bcc29d3cc30..c22214c824b220d247296da22fc007a18edd957d 100644 (file)
--- a/src/cocoa/dcclient.mm
+++ b/src/cocoa/dcclient.mm
@@ -70,7 +70,10 @@ bool wxWindowDC::CocoaUnlockFocusOnNSView()
 bool wxWindowDC::CocoaLockFocus()
 {
     wxLogTrace(wxTRACE_COCOA,wxT("Locking focus on wxWindowDC=%p, NSView=%p"),this, m_window->GetNonClientNSView());
 bool wxWindowDC::CocoaLockFocus()
 {
     wxLogTrace(wxTRACE_COCOA,wxT("Locking focus on wxWindowDC=%p, NSView=%p"),this, m_window->GetNonClientNSView());

-    m_cocoaWxToBoundsTransform = CocoaGetWxToBoundsTransform([m_window->GetNonClientNSView() isFlipped], [m_window->GetNonClientNSView() bounds].size.height);
+    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());
 }
 
     return CocoaLockFocusOnNSView(m_window->GetNonClientNSView());
 }
 


@@ -113,7 +116,10 @@ wxClientDC::~wxClientDC(void)
 bool wxClientDC::CocoaLockFocus()
 {
     wxLogTrace(wxTRACE_COCOA,wxT("Locking focus on wxClientDC=%p, NSView=%p"),this, m_window->GetNSView());
 bool wxClientDC::CocoaLockFocus()
 {
     wxLogTrace(wxTRACE_COCOA,wxT("Locking focus on wxClientDC=%p, NSView=%p"),this, m_window->GetNSView());

-    m_cocoaWxToBoundsTransform = m_window->CocoaGetWxToBoundsTransform();
+    NSAffineTransform *newTransform = m_window->CocoaGetWxToBoundsTransform();
+    [newTransform retain];
+    [m_cocoaWxToBoundsTransform release];
+    m_cocoaWxToBoundsTransform = newTransform;

     return CocoaLockFocusOnNSView(m_window->GetNSView());
 }
 
     return CocoaLockFocusOnNSView(m_window->GetNSView());
 }
 


@@ -138,7 +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();
     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_cocoaWxToBoundsTransform = window->CocoaGetWxToBoundsTransform();
+    NSAffineTransform *newTransform = window->CocoaGetWxToBoundsTransform();
+    [newTransform retain];
+    [m_cocoaWxToBoundsTransform release];
+    m_cocoaWxToBoundsTransform = newTransform;

     CocoaApplyTransformations();
 };
 
     CocoaApplyTransformations();
 };
 

diff --git a/src/cocoa/dcmemory.mm b/src/cocoa/dcmemory.mm
index fb11593b35d9c60cd869eda171f73b93157ff561..0f2f04c365e862307df8a0f9e2c9396cc0b6fc1b 100644 (file)
--- a/src/cocoa/dcmemory.mm
+++ b/src/cocoa/dcmemory.mm
@@ -53,7 +53,10 @@ bool wxMemoryDC::CocoaLockFocus()
     {
         [m_cocoaNSImage lockFocus];
         sm_cocoaDCStack.Insert(this);
     {
         [m_cocoaNSImage lockFocus];
         sm_cocoaDCStack.Insert(this);

-        m_cocoaWxToBoundsTransform = CocoaGetWxToBoundsTransform([m_cocoaNSImage isFlipped], [m_cocoaNSImage size].height);
+        NSAffineTransform *newTransform = CocoaGetWxToBoundsTransform([m_cocoaNSImage isFlipped], [m_cocoaNSImage size].height);
+        [newTransform retain];
+        [m_cocoaWxToBoundsTransform release];
+        m_cocoaWxToBoundsTransform = newTransform;

         CocoaApplyTransformations();
         return true;
     }
         CocoaApplyTransformations();
         return true;
     }