Add wxPropertyGridEditorEventForwarders into wxPendingDelete

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

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index b8466f0ea6f8ef1f07da84ea6fe700c08c6cd1a3..56738c1635af53778c551d8e9ab3dbbb50aa27f4 100644 (file)
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -3219,16 +3219,18 @@ void wxPropertyGrid::FreeEditors()
     // Do not free editors immediately if processing events
     if ( m_wndEditor2 )
     {
-        m_wndEditor2->PopEventHandler(true);
+        wxEvtHandler* handler = m_wndEditor2->PopEventHandler(false);
         m_wndEditor2->Hide();
+        wxPendingDelete.Append( handler );
         wxPendingDelete.Append( m_wndEditor2 );
         m_wndEditor2 = NULL;
     }
 
     if ( m_wndEditor )
     {
-        m_wndEditor->PopEventHandler(true);
+        wxEvtHandler* handler = m_wndEditor->PopEventHandler(false);
         m_wndEditor->Hide();
+        wxPendingDelete.Append( handler );
         wxPendingDelete.Append( m_wndEditor );
         m_wndEditor = NULL;
     }