From b4a5e7b6f19bcef7449c87d46ab46af1b4aaec6b Mon Sep 17 00:00:00 2001
From: Kevin Hock <hockkn@yahoo.com>
Date: Fri, 28 Jan 2005 19:01:40 +0000
Subject: [PATCH] Close tree edit even if the change is vetoed to be consistent
 with MSW [patch 1110252]

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/generic/treectlg.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 70a21e2ced..98b64ffcdd 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -424,12 +424,12 @@ void wxTreeTextCtrl::OnChar( wxKeyEvent &event )
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:
-            if ( AcceptChanges() )
-            {
-                // Close the text control, changes were accepted
-                Finish();
-            }
-            // else do nothing, do not accept and do not close
+            // Notify the owner about the changes
+            AcceptChanges();
+
+            // Even if vetoed, close the control (consistent with MSW)
+            Finish();
+
             break;
 
         case WXK_ESCAPE:
-- 
2.45.2