wxUniversal fixes:

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

diff --git a/wxPython/demo/wxTextCtrl.py b/wxPython/demo/wxTextCtrl.py
index 66fbd17c53edf68c37d94b902d866e1ff0927bb5..56098d2023f6b63e0f7694954f0eaf80d0ad5cdb 100644 (file)
--- a/wxPython/demo/wxTextCtrl.py
+++ b/wxPython/demo/wxTextCtrl.py
@@ -10,6 +10,10 @@ class TestPanel(wxPanel):
     def OnKillFocus(self, evt):
         print "OnKillFocus"
         evt.Skip()
     def OnKillFocus(self, evt):
         print "OnKillFocus"
         evt.Skip()

+    def OnWindowDestroy(self, evt):
+        print "OnWindowDestroy"
+        evt.Skip()
+

 
     def __init__(self, parent, log):
         wxPanel.__init__(self, parent, -1)
 
     def __init__(self, parent, log):
         wxPanel.__init__(self, parent, -1)


@@ -22,19 +26,23 @@ class TestPanel(wxPanel):
         EVT_CHAR(t1, self.EvtChar)
         EVT_SET_FOCUS(t1, self.OnSetFocus)
         EVT_KILL_FOCUS(t1, self.OnKillFocus)
         EVT_CHAR(t1, self.EvtChar)
         EVT_SET_FOCUS(t1, self.OnSetFocus)
         EVT_KILL_FOCUS(t1, self.OnKillFocus)

-
+        EVT_WINDOW_DESTROY(t1, self.OnWindowDestroy)

 
         l2 = wxStaticText(self, -1, "Passsword")
         t2 = wxTextCtrl(self, 20, "", size=(125, -1), style=wxTE_PASSWORD)
         EVT_TEXT(self, 20, self.EvtText)
 
         l3 = wxStaticText(self, -1, "Multi-line")
 
         l2 = wxStaticText(self, -1, "Passsword")
         t2 = wxTextCtrl(self, 20, "", size=(125, -1), style=wxTE_PASSWORD)
         EVT_TEXT(self, 20, self.EvtText)
 
         l3 = wxStaticText(self, -1, "Multi-line")

-        t3 = wxTextCtrl(self, 30, "How does it work with a long line of text set in the control",
+        t3 = wxTextCtrl(self, 30,
+                        "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=wxTE_MULTILINE)
         t3.SetInsertionPoint(0)
         EVT_TEXT(self, 30, self.EvtText)
         b = wxButton(self, -1, "Test Replace")
         EVT_BUTTON(self, b.GetId(), self.OnTestReplace)
                        size=(200, 100), style=wxTE_MULTILINE)
         t3.SetInsertionPoint(0)
         EVT_TEXT(self, 30, self.EvtText)
         b = wxButton(self, -1, "Test Replace")
         EVT_BUTTON(self, b.GetId(), self.OnTestReplace)

+        b2 = wxButton(self, -1, "Test GetSelection")
+        EVT_BUTTON(self, b2.GetId(), self.OnTestGetSelection)

         self.tc = t3
 
         l4 = wxStaticText(self, -1, "Rich Text")
         self.tc = t3
 
         l4 = wxStaticText(self, -1, "Rich Text")


@@ -44,16 +52,20 @@ class TestPanel(wxPanel):
         t4.SetStyle(44, 47, wxTextAttr("RED", "YELLOW"))
 
         points = t4.GetFont().GetPointSize()  # get the current size
         t4.SetStyle(44, 47, wxTextAttr("RED", "YELLOW"))
 
         points = t4.GetFont().GetPointSize()  # get the current size

-        f = wxFont(points+2, wxROMAN, wxITALIC, wxBOLD, true)
+        f = wxFont(points+3, wxROMAN, wxITALIC, wxBOLD, true)

 ##         print 'a1', sys.getrefcount(f)
 ##         t4.SetStyle(63, 77, wxTextAttr("BLUE", font=f))
         t4.SetStyle(63, 77, wxTextAttr("BLUE", wxNullColour, f))
 ##         print 'a2', sys.getrefcount(f)
 
 ##         print 'a1', sys.getrefcount(f)
 ##         t4.SetStyle(63, 77, wxTextAttr("BLUE", font=f))
         t4.SetStyle(63, 77, wxTextAttr("BLUE", wxNullColour, f))
 ##         print 'a2', sys.getrefcount(f)
 

+        bsizer = wxBoxSizer(wxVERTICAL)
+        bsizer.Add(b, 0, wxGROW)
+        bsizer.Add(b2, 0, wxGROW)
+

         sizer = wxFlexGridSizer(cols=3, hgap=6, vgap=6)
         sizer.AddMany([ l1, t1, (0,0),
                         l2, t2, (0,0),
         sizer = wxFlexGridSizer(cols=3, hgap=6, vgap=6)
         sizer.AddMany([ l1, t1, (0,0),
                         l2, t2, (0,0),

-                        l3, t3, b,
+                        l3, t3, bsizer,

                         l4, t4, (0,0),
                         ])
         border = wxBoxSizer(wxVERTICAL)
                         l4, t4, (0,0),
                         ])
         border = wxBoxSizer(wxVERTICAL)


@@ -72,8 +84,20 @@ class TestPanel(wxPanel):
 
 
     def OnTestReplace(self, evt):
 
 
     def OnTestReplace(self, evt):

-        self.tc.Replace(4, 8, "DOES")
-        #self.tc.Remove(4, 8)
+        self.tc.Replace(5, 9, "IS A")
+        #self.tc.Remove(5, 9)
+
+    def OnTestGetSelection(self, evt):
+        start, end = self.tc.GetSelection()
+        text = self.tc.GetValue()
+        if wxPlatform == "__WXMSW__":  # This is why GetStringSelection was added
+            text = string.replace(text, '\n', '\r\n')
+        self.log.write("GetSelection(): (%d, %d)\n"
+                       "\tGetStringSelection(): %s\n"
+                       "\tSelectedText: %s\n" %
+                       (start, end,
+                        self.tc.GetStringSelection(),
+                        repr(text[start:end])))

 
 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------