No need to use 2-phase create of the text ctrl

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

diff --git a/wxPython/wx/lib/mixins/listctrl.py b/wxPython/wx/lib/mixins/listctrl.py
index fbfc82a229cc392e4f5d67c89e2e7121b0c9e066..06e9e392c2a606ad2ddd6c2761f7732c47bdf6d4 100644 (file)
--- a/wxPython/wx/lib/mixins/listctrl.py
+++ b/wxPython/wx/lib/mixins/listctrl.py
@@ -424,7 +424,6 @@ class TextEditMixin:
 
 
     def make_editor(self, col_style=wx.LIST_FORMAT_LEFT):
 
 
     def make_editor(self, col_style=wx.LIST_FORMAT_LEFT):

-        editor = wx.PreTextCtrl()

         
         style =wx.TE_PROCESS_ENTER|wx.TE_PROCESS_TAB|wx.TE_RICH2
         style |= {wx.LIST_FORMAT_LEFT: wx.TE_LEFT,
         
         style =wx.TE_PROCESS_ENTER|wx.TE_PROCESS_TAB|wx.TE_RICH2
         style |= {wx.LIST_FORMAT_LEFT: wx.TE_LEFT,


@@ -432,7 +431,7 @@ class TextEditMixin:
                   wx.LIST_FORMAT_CENTRE : wx.TE_CENTRE
                   }[col_style]
         
                   wx.LIST_FORMAT_CENTRE : wx.TE_CENTRE
                   }[col_style]
         

-        editor.Create(self, -1, style=style)
+        editor = wx.TextCtrl(self, -1, style=style)

         editor.SetBackgroundColour(self.editorBgColour)
         editor.SetForegroundColour(self.editorFgColour)
         font = self.GetFont()
         editor.SetBackgroundColour(self.editorBgColour)
         editor.SetForegroundColour(self.editorFgColour)
         font = self.GetFont()


@@ -442,6 +441,8 @@ class TextEditMixin:
         self.curCol = 0
 
         editor.Hide()
         self.curCol = 0
 
         editor.Hide()

+        if hasattr(self, 'editor'):
+            self.editor.Destroy()

         self.editor = editor
 
         self.col_style = col_style
         self.editor = editor
 
         self.col_style = col_style