WinCE patches from "Viktor Voroshylo" <viktor@voroshylo.com>

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

diff --git a/wxPython/demo/wxTextCtrl.py b/wxPython/demo/wxTextCtrl.py
index 1045efe3d0e23b0492b5a45eba2baf48fb816178..31f8a6d3209b9ec71a531713ac636ad15bb07a84 100644 (file)
--- a/wxPython/demo/wxTextCtrl.py
+++ b/wxPython/demo/wxTextCtrl.py
@@ -29,7 +29,7 @@ class TestPanel(wxPanel):
         EVT_KILL_FOCUS(t1, self.OnKillFocus)
         EVT_WINDOW_DESTROY(t1, self.OnWindowDestroy)
 
-        l2 = wxStaticText(self, -1, "Passsword")
+        l2 = wxStaticText(self, -1, "Password")
         t2 = wxTextCtrl(self, -1, "", size=(125, -1), style=wxTE_PASSWORD)
         EVT_TEXT(self, t2.GetId(), self.EvtText)
 
@@ -47,8 +47,6 @@ class TestPanel(wxPanel):
         b3 = wxButton(self, -1, "Test WriteText")
         EVT_BUTTON(self, b3.GetId(), self.OnTestWriteText)
         self.tc = t3
-        b4 = wxButton(self, -1, "Test Simulated Event")
-        EVT_BUTTON(self, b4.GetId(), self.OnTestEvent)
 
 
         l4 = wxStaticText(self, -1, "Rich Text")
@@ -74,7 +72,6 @@ class TestPanel(wxPanel):
         bsizer.Add(b, 0, wxGROW|wxALL, 4)
         bsizer.Add(b2, 0, wxGROW|wxALL, 4)
         bsizer.Add(b3, 0, wxGROW|wxALL, 4)
-        bsizer.Add(b4, 0, wxGROW|wxALL, 4)
 
         sizer = wxFlexGridSizer(cols=3, hgap=6, vgap=6)
         sizer.AddMany([ l1, t1, (0,0),
@@ -110,13 +107,25 @@ class TestPanel(wxPanel):
         text = self.tc.GetValue()
         if wxPlatform == "__WXMSW__":  # This is why GetStringSelection was added
             text = text.replace('\n', '\r\n')
-        self.log.write("GetSelection(): (%d, %d)\n"
+        self.log.write("multi-line GetSelection(): (%d, %d)\n"
                        "\tGetStringSelection(): %s\n"
                        "\tSelectedText: %s\n" %
                        (start, end,
                         self.tc.GetStringSelection(),
                         repr(text[start:end])))
 
+        start, end = self.tc1.GetSelection()
+        text = self.tc1.GetValue()
+        if wxPlatform == "__WXMSW__":  # This is why GetStringSelection was added
+            text = text.replace('\n', '\r\n')
+        self.log.write("single-line GetSelection(): (%d, %d)\n"
+                       "\tGetStringSelection(): %s\n"
+                       "\tSelectedText: %s\n" %
+                       (start, end,
+                        self.tc1.GetStringSelection(),
+                        repr(text[start:end])))
+
+
     def OnT5LeftDown(self, evt):
         evt.Skip()
         wxCallAfter(self.LogT5Position, evt)
@@ -133,14 +142,6 @@ class TestPanel(wxPanel):
                        % (ip, text[ip], lp, len(text)))
 
 
-    def OnTestEvent(self, evt):
-        ke = wxKeyEvent(wxEVT_CHAR)
-        ke.SetEventObject(self.tc1)
-        ke.SetId(self.tc1.GetId())
-        ke.m_keyCode = ord('A')
-        self.tc1.GetEventHandler().ProcessEvent(ke)
-
-
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):