From: Robert Roebling <robert@roebling.de>
Date: Thu, 31 Mar 2005 21:00:29 +0000 (+0000)
Subject:   Fix the fix for not sending two end label edit events
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ce17501854573f9c95cc04e6eb344d3a3912f7c0

  Fix the fix for not sending two end label edit events
    because that fix prevented anyone from finishing the
    edit by keys.


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

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index f02f3b99cc..5c5a6b521c 100644
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -2147,7 +2147,7 @@ void wxListTextCtrl::OnKeyUp( wxKeyEvent &event )
 
 void wxListTextCtrl::OnKillFocus( wxFocusEvent &event )
 {
-    if ( !m_finished )
+    if ( !m_finished && !m_aboutToFinish  )
     {
         // We must finish regardless of success, otherwise we'll get
         // focus problems:
diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 5a6c21a1b3..25d04b0dee 100644
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -415,7 +415,7 @@ bool wxTreeTextCtrl::AcceptChanges()
 
 void wxTreeTextCtrl::Finish()
 {
-    if ( !m_finished && !m_aboutToFinish )
+    if ( !m_finished  )
     {
         m_owner->ResetTextControl();
 
@@ -470,7 +470,7 @@ void wxTreeTextCtrl::OnKeyUp( wxKeyEvent &event )
 
 void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &event )
 {
-    if ( !m_finished )
+    if ( !m_finished && !m_aboutToFinish )
     {
         // We must finish regardless of success, otherwise we'll get
         // focus problems: