Fix destruction of wxDataViewCtrl's editor control.

Don't pop event handler from the control more than once.

See r70002 and r70005 (which this reverts) for reference.

Fixes #14215.

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

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 8fbe034293ec0ccb15bd80c234727f52fe1f9a19..db46cfbc292e818d3915b06ff65d8b2ea34a4992 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -715,6 +715,9 @@ void wxDataViewRendererBase::DestroyEditControl()
 
     wxPendingDelete.Append(handler);
     wxPendingDelete.Append(m_editorCtrl);
 
     wxPendingDelete.Append(handler);
     wxPendingDelete.Append(m_editorCtrl);

+
+    // Ensure that DestroyEditControl() is not called again for this control.
+    m_editorCtrl.Release();

 }
 
 void wxDataViewRendererBase::CancelEditing()
 }
 
 void wxDataViewRendererBase::CancelEditing()