Remove delegates before releasing the native object, so that we don't have delegate...

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

diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index 312759735621f50f9098742c6b11cce01ed7153e..705fdc89471a776d036c25b3f9072e0a2b223f5c 100644 (file)
--- a/src/osx/cocoa/menu.mm
+++ b/src/osx/cocoa/menu.mm
@@ -186,6 +186,7 @@ protected :
 
 wxMenuCocoaImpl::~wxMenuCocoaImpl()
 {
 
 wxMenuCocoaImpl::~wxMenuCocoaImpl()
 {

+    [m_osxMenu setDelegate:nil];

     [m_osxMenu release];
 }
 
     [m_osxMenu release];
 }
 

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index f442eef85a0c6808a251cd2c91a6c6278084001e..ac233c8e19cac51c9d10f5e2f102a5e620640e45 100644 (file)
--- a/src/osx/cocoa/nonownedwnd.mm
+++ b/src/osx/cocoa/nonownedwnd.mm
@@ -227,6 +227,7 @@ wxNonOwnedWindowCocoaImpl::wxNonOwnedWindowCocoaImpl()
     
 wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl()
 {
     
 wxNonOwnedWindowCocoaImpl::~wxNonOwnedWindowCocoaImpl()
 {

+    [m_macWindow setDelegate:nil];

     [m_macWindow release];
 }
 
     [m_macWindow release];
 }
 

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index 50ff8949a48e9508ec9a98fc9cf68e6d6c1454e3..b93b614850563e5c0431b4282048fe45f366bfb8 100644 (file)
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -633,6 +633,7 @@ wxToolBar::~wxToolBar()
         if (m_macUsesNativeToolbar)
             MacInstallNativeToolbar( false );
 
         if (m_macUsesNativeToolbar)
             MacInstallNativeToolbar( false );
 

+        [(NSToolbar*)m_macToolbar setDelegate:nil];

         [(NSToolbar*)m_macToolbar release];
         m_macToolbar = NULL;
     }
         [(NSToolbar*)m_macToolbar release];
         m_macToolbar = NULL;
     }