From dea9430d44a38837380865289c387ccd1f68a9de Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 30 Apr 2012 14:51:52 +0000 Subject: [PATCH] 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 --- src/common/datavcmn.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp index 8fbe034293..db46cfbc29 100644 --- a/src/common/datavcmn.cpp +++ b/src/common/datavcmn.cpp @@ -715,6 +715,9 @@ void wxDataViewRendererBase::DestroyEditControl() wxPendingDelete.Append(handler); wxPendingDelete.Append(m_editorCtrl); + + // Ensure that DestroyEditControl() is not called again for this control. + m_editorCtrl.Release(); } void wxDataViewRendererBase::CancelEditing() -- 2.45.2