make sure no delegates/impl ptrs are still set during destruction

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

diff --git a/src/osx/cocoa/menu.mm b/src/osx/cocoa/menu.mm
index 705fdc89471a776d036c25b3f9072e0a2b223f5c..628f38ecfb2db1035492e8921ceb2144b4159c0f 100644 (file)
--- a/src/osx/cocoa/menu.mm
+++ b/src/osx/cocoa/menu.mm
@@ -39,6 +39,7 @@
 - (id) init
 {
     [super init];
 - (id) init
 {
     [super init];

+    impl = NULL;

     return self;
 }
 
     return self;
 }
 


@@ -123,8 +124,15 @@
 class wxMenuCocoaImpl : public wxMenuImpl 
 {
 public :
 class wxMenuCocoaImpl : public wxMenuImpl 
 {
 public :

-    wxMenuCocoaImpl( wxMenu* peer , NSMenu* menu) : wxMenuImpl(peer), m_osxMenu(menu)
+    wxMenuCocoaImpl( wxMenu* peer , wxNSMenu* menu) : wxMenuImpl(peer), m_osxMenu(menu)

     {
     {

+        static wxNSMenuController* controller = NULL;
+        if ( controller == NULL )
+        {
+            controller = [[wxNSMenuController alloc] init];
+        }
+        [menu setDelegate:controller];
+        [m_osxMenu setImplementation:this];

     }
     
     virtual ~wxMenuCocoaImpl();
     }
     
     virtual ~wxMenuCocoaImpl();


@@ -181,26 +189,20 @@ public :
     static wxMenuImpl* Create( wxMenu* peer, const wxString& title );
     static wxMenuImpl* CreateRootMenu( wxMenu* peer );
 protected :
     static wxMenuImpl* Create( wxMenu* peer, const wxString& title );
     static wxMenuImpl* CreateRootMenu( wxMenu* peer );
 protected :

-    NSMenu* m_osxMenu;
+    wxNSMenu* m_osxMenu;

 } ;
 
 wxMenuCocoaImpl::~wxMenuCocoaImpl()
 {
     [m_osxMenu setDelegate:nil];
 } ;
 
 wxMenuCocoaImpl::~wxMenuCocoaImpl()
 {
     [m_osxMenu setDelegate:nil];

+    [m_osxMenu setImplementation:nil];

     [m_osxMenu release];
 }
 
 wxMenuImpl* wxMenuImpl::Create( wxMenu* peer, const wxString& title )
 {
     [m_osxMenu release];
 }
 
 wxMenuImpl* wxMenuImpl::Create( wxMenu* peer, const wxString& title )
 {

-    static wxNSMenuController* controller = NULL;
-    if ( controller == NULL )
-    {
-        controller = [[wxNSMenuController alloc] init];
-    }

     wxCFStringRef cfText( title );
     wxNSMenu* menu = [[wxNSMenu alloc] initWithTitle:cfText.AsNSString()];
     wxMenuImpl* c = new wxMenuCocoaImpl( peer, menu );
     wxCFStringRef cfText( title );
     wxNSMenu* menu = [[wxNSMenu alloc] initWithTitle:cfText.AsNSString()];
     wxMenuImpl* c = new wxMenuCocoaImpl( peer, menu );

-    [menu setDelegate:controller];
-    [menu setImplementation:c];

     return c;
 }
     return c;
 }

diff --git a/src/osx/cocoa/menuitem.mm b/src/osx/cocoa/menuitem.mm
index 6b05d359fbd999f5b43dc99dfb022afa1f39120f..8a81661f541f7a09c3b6059c10b9773ed6a617f6 100644 (file)
--- a/src/osx/cocoa/menuitem.mm
+++ b/src/osx/cocoa/menuitem.mm
@@ -170,6 +170,8 @@ class wxMenuItemCocoaImpl : public wxMenuItemImpl
 public :
     wxMenuItemCocoaImpl( wxMenuItem* peer, NSMenuItem* item ) : wxMenuItemImpl(peer), m_osxMenuItem(item)
     {
 public :
     wxMenuItemCocoaImpl( wxMenuItem* peer, NSMenuItem* item ) : wxMenuItemImpl(peer), m_osxMenuItem(item)
     {

+        if ( ![m_osxMenuItem isSeparatorItem] )
+            [(wxNSMenuItem*)m_osxMenuItem setImplementation:this];

     }
     
     ~wxMenuItemCocoaImpl();
     }
     
     ~wxMenuItemCocoaImpl();


@@ -212,6 +214,8 @@ protected :
 
 wxMenuItemCocoaImpl::~wxMenuItemCocoaImpl()
 {
 
 wxMenuItemCocoaImpl::~wxMenuItemCocoaImpl()
 {

+    if ( ![m_osxMenuItem isSeparatorItem] )
+        [(wxNSMenuItem*)m_osxMenuItem setImplementation:nil];

 }
 
 
 }
 
 


@@ -253,9 +257,5 @@ wxMenuItemImpl* wxMenuItemImpl::Create( wxMenuItem* peer, wxMenu *pParentMenu,
         item = temp;
     }
     c = new wxMenuItemCocoaImpl( peer, item );
         item = temp;
     }
     c = new wxMenuItemCocoaImpl( peer, item );

-    if ( kind != wxITEM_SEPARATOR )
-    {
-        [(wxNSMenuItem*)item setImplementation:c];
-    }

     return c;
 }
     return c;
 }

diff --git a/src/osx/cocoa/nonownedwnd.mm b/src/osx/cocoa/nonownedwnd.mm
index ac233c8e19cac51c9d10f5e2f102a5e620640e45..e2ce53b5a6bd2f6eeb60a96b1fbd29b702bb6091 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 setImplementation:nil];

     [m_macWindow setDelegate:nil];
     [m_macWindow release];
 }
     [m_macWindow setDelegate:nil];
     [m_macWindow release];
 }