Merge pull request #1246 from Nyral/label_multiple_edit_fix

Fixes #1235: CustomTreeCtrl edit label remains stuck forever (cherry picked from commit 4d336e1)
wxWidgets · Sep 13, 2019 · 53a49bd · 53a49bd
1 parent a450923
commit 53a49bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -25,6 +25,8 @@ This release provides the following fixes:
 * Switch to using a wx.Overlay in the Widget Inspection Tool to highlight
   widgets when running on a GTK3 port.
 
+* Fixed issue in wx.lib.agw.customtreectrl where label editor could remain
+  stuck forever (#1235).
 
 
 4.0.6 "Applesauce"

diff --git a/wx/lib/agw/customtreectrl.py b/wx/lib/agw/customtreectrl.py
@@ -7733,8 +7733,9 @@ def Edit(self, item):
         if self._editCtrl != None and item != self._editCtrl.item():
             self._editCtrl.StopEditing()
 
-        self._editCtrl = TreeTextCtrl(self, item=item)
-        self._editCtrl.SetFocus()
+        if self._editCtrl is None:
+            self._editCtrl = TreeTextCtrl(self, item=item)
+            self._editCtrl.SetFocus()
 
 
     def GetEditControl(self):