From 3673966ee3207c151cb3622a59eea6e30ef6ecab Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 17 Apr 2015 13:17:09 +0200
Subject: [PATCH] Check GetValueFromEditorCtrl() return code in wxDataViewCtrl
 code.

Don't do anything when finishing editing an item if its new value couldn't be
retrieved.

See #16912.
---
 src/common/datavcmn.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index bca4238c11..0cd0907fa3 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -746,7 +746,8 @@ bool wxDataViewRendererBase::FinishEditing()
         return true;
 
     wxVariant value;
-    GetValueFromEditorCtrl( m_editorCtrl, value );
+    if ( !GetValueFromEditorCtrl(m_editorCtrl, value) )
+        return false;
 
     wxDataViewCtrl* dv_ctrl = GetOwner()->GetOwner();