Don't use a destroy event handler to disconnect the native control's delegate as...

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

diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h
index da7ede4551c41e3f12c74e01b10a2c9dd25bde5b..eee92a7ea6006f5bcc8794e05b447f12cebb6821 100644 (file)
--- a/include/wx/osx/nonownedwnd.h
+++ b/include/wx/osx/nonownedwnd.h
@@ -103,6 +103,8 @@ public:
     virtual void HandleResized( double timestampsec );
     virtual void HandleMoved( double timestampsec );
     virtual void HandleResizing( double timestampsec, wxRect* rect );
     virtual void HandleResized( double timestampsec );
     virtual void HandleMoved( double timestampsec );
     virtual void HandleResizing( double timestampsec, wxRect* rect );

+    
+    virtual bool Destroy();

 
 protected:
     // common part of all ctors
 
 protected:
     // common part of all ctors


@@ -117,7 +119,7 @@ protected:
                                    wxShowEffect effect,
                                    unsigned timeout);
     
                                    wxShowEffect effect,
                                    unsigned timeout);
     

-    void OnWindowDestroy( wxWindowDestroyEvent &event);
+    virtual void WillBeDestroyed();

 
     wxNonOwnedWindowImpl* m_nowpeer ;
 
 
     wxNonOwnedWindowImpl* m_nowpeer ;
 

diff --git a/src/osx/nonownedwnd_osx.cpp b/src/osx/nonownedwnd_osx.cpp
index 12d8d61aab9248148870d92e23550a44214521a6..017107215f22521e3e247c280e9dc01380018a69 100644 (file)
--- a/src/osx/nonownedwnd_osx.cpp
+++ b/src/osx/nonownedwnd_osx.cpp
@@ -147,9 +147,6 @@ bool wxNonOwnedWindow::Create(wxWindow *parent,
     if ( parent )
         parent->AddChild(this);
 
     if ( parent )
         parent->AddChild(this);
 

-    wxBIND_OR_CONNECT_HACK(this, wxEVT_DESTROY, wxWindowDestroyEventHandler,
-                           wxNonOwnedWindow::OnWindowDestroy, this);
-

     return true;
 }
 
     return true;
 }
 


@@ -169,10 +166,15 @@ wxNonOwnedWindow::~wxNonOwnedWindow()
         s_macDeactivateWindow = NULL;
 }
 
         s_macDeactivateWindow = NULL;
 }
 

-void wxNonOwnedWindow::OnWindowDestroy( wxWindowDestroyEvent &event)
+bool wxNonOwnedWindow::Destroy()

 {
 {

-    event.Skip();
+    WillBeDestroyed();

     
     

+    return wxWindow::Destroy();
+}
+
+void wxNonOwnedWindow::WillBeDestroyed()
+{

     if ( m_nowpeer )
         m_nowpeer->WillBeDestroyed();
 }
     if ( m_nowpeer )
         m_nowpeer->WillBeDestroyed();
 }