Another package name fix

[wxWidgets.git] / wxPython / demo / TextCtrl.py

diff --git a/wxPython/demo/TextCtrl.py b/wxPython/demo/TextCtrl.py
index c9798237fbe33bdb3d01658f44939349b070a841..003c100da76ffc4f645993e1068257e4e06d5bd6 100644 (file)
--- a/wxPython/demo/TextCtrl.py
+++ b/wxPython/demo/TextCtrl.py
@@ -22,7 +22,7 @@ class TestPanel(wx.Panel):
 
         l1 = wx.StaticText(self, -1, "wx.TextCtrl")
         t1 = wx.TextCtrl(self, -1, "Test it out and see", size=(125, -1))
 
         l1 = wx.StaticText(self, -1, "wx.TextCtrl")
         t1 = wx.TextCtrl(self, -1, "Test it out and see", size=(125, -1))

-        t1.SetInsertionPoint(0)
+        wx.CallAfter(t1.SetInsertionPoint, 0)

         self.tc1 = t1
 
         self.Bind(wx.EVT_TEXT, self.EvtText, t1)
         self.tc1 = t1
 
         self.Bind(wx.EVT_TEXT, self.EvtText, t1)


@@ -39,10 +39,12 @@ class TestPanel(wx.Panel):
         t3 = wx.TextCtrl(self, -1,
                         "Here is a looooooooooooooong line of text set in the control.\n\n"
                         "The quick brown fox jumped over the lazy dog...",
         t3 = wx.TextCtrl(self, -1,
                         "Here is a looooooooooooooong line of text set in the control.\n\n"
                         "The quick brown fox jumped over the lazy dog...",

-                       size=(200, 100), style=wx.TE_MULTILINE)
+                       size=(200, 100), style=wx.TE_MULTILINE|wx.TE_PROCESS_ENTER)

 
         t3.SetInsertionPoint(0)
         self.Bind(wx.EVT_TEXT, self.EvtText, t3)
 
         t3.SetInsertionPoint(0)
         self.Bind(wx.EVT_TEXT, self.EvtText, t3)

+        self.Bind(wx.EVT_TEXT_ENTER, self.EvtTextEnter, t3)
+        

         b = wx.Button(self, -1, "Test Replace")
         self.Bind(wx.EVT_BUTTON, self.OnTestReplace, b)
         b2 = wx.Button(self, -1, "Test GetSelection")
         b = wx.Button(self, -1, "Test Replace")
         self.Bind(wx.EVT_BUTTON, self.OnTestReplace, b)
         b2 = wx.Button(self, -1, "Test GetSelection")


@@ -92,6 +94,9 @@ class TestPanel(wx.Panel):
     def EvtText(self, event):
         self.log.WriteText('EvtText: %s\n' % event.GetString())
 
     def EvtText(self, event):
         self.log.WriteText('EvtText: %s\n' % event.GetString())
 

+    def EvtTextEnter(self, event):
+        self.log.WriteText('EvtTextEnter\n')
+        event.Skip()

 
     def EvtChar(self, event):
         self.log.WriteText('EvtChar: %d\n' % event.GetKeyCode())
 
     def EvtChar(self, event):
         self.log.WriteText('EvtChar: %d\n' % event.GetKeyCode())


@@ -169,5 +174,5 @@ text masking for such things as passwords.
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])