Dont't finish any editing if there is no control

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

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 54cf95900200e4f586845440b207b7e76f4d156c..eaf672d2a572e30821228077cf453d61fbb93c75 100644 (file)
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -720,6 +720,8 @@ bool wxDataViewRendererBase::StartEditing( const wxDataViewItem &item, wxRect la
 
 void wxDataViewRendererBase::CancelEditing()
 {
 
 void wxDataViewRendererBase::CancelEditing()
 {

+    if (!m_editorCtrl) return;
+    

     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
 
     m_editorCtrl->Hide();
     GetOwner()->GetOwner()->GetMainWindow()->SetFocus();
 
     m_editorCtrl->Hide();


@@ -728,6 +730,8 @@ void wxDataViewRendererBase::CancelEditing()
 
 bool wxDataViewRendererBase::FinishEditing()
 {
 
 bool wxDataViewRendererBase::FinishEditing()
 {

+    if (!m_editorCtrl) return true;
+

     wxVariant value;
     GetValueFromEditorCtrl( m_editorCtrl, value );
 
     wxVariant value;
     GetValueFromEditorCtrl( m_editorCtrl, value );