From 9146872cb5243c629dfb0afc51fd5d8d8ca22826 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 23 Jul 2004 16:45:28 +0000 Subject: [PATCH] changed to behave in same way as native win32 control and generic wxListCtrl when wxEVT_COMMAND_TREE_END_LABEL_EDIT is vetoed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/treectlg.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index 4f7bb21448..69094f0757 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -448,16 +448,17 @@ void wxTreeTextCtrl::OnKeyUp( wxKeyEvent &event ) void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &event ) { - if ( m_finished ) - { - event.Skip(); - return; - } - - if ( AcceptChanges() ) + if ( !m_finished ) { + AcceptChanges(); + // We must finish regardless of success, otherwise we'll get + // focus problems: Finish(); } + + // We must let the native text control handle focus, too, otherwise + // it could have problems with the cursor (e.g., in wxGTK): + event.Skip(); } // ----------------------------------------------------------------------------- -- 2.45.2