From: Václav Slavík <vslavik@fastmail.fm>
Date: Mon, 30 Apr 2012 14:51:52 +0000 (+0000)
Subject: Fix destruction of wxDataViewCtrl's editor control.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/dea9430d44a38837380865289c387ccd1f68a9de

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 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()