From 17ba20860d6aebe3324757ce5a8a1f1a1d69d51f Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Thu, 22 Jan 2009 17:22:10 +0000 Subject: [PATCH] Add wxPropertyGridEditorEventForwarders into wxPendingDelete git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/propgrid/propgrid.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index b8466f0ea6..56738c1635 100644 --- 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; } -- 2.45.2