added wxControlWithItems docs, updated the others to refer to it

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

diff --git a/wxPython/demo/wxTextCtrl.py b/wxPython/demo/wxTextCtrl.py
index dc6ee5f79a1d5073b70bdf8ff6fa052152d902d1..7b554563991bc16799c545241e45eb4d1fba7a4d 100644 (file)
--- a/wxPython/demo/wxTextCtrl.py
+++ b/wxPython/demo/wxTextCtrl.py
@@ -47,16 +47,13 @@ class TestPanel(wxPanel):
 
         l4 = wxStaticText(self, -1, "Rich Text")
         t4 = wxTextCtrl(self, 40, "If supported by the native control, this is red, and this is a different font.",
-                        size=(200, 100), style=wxTE_MULTILINE|wxTE_RICH)
+                        size=(200, 100), style=wxTE_MULTILINE|wxTE_RICH2)
         t4.SetInsertionPoint(0)
         t4.SetStyle(44, 47, wxTextAttr("RED", "YELLOW"))
 
         points = t4.GetFont().GetPointSize()  # get the current size
         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)
 
         bsizer = wxBoxSizer(wxVERTICAL)
         bsizer.Add(b, 0, wxGROW)
@@ -90,11 +87,14 @@ class TestPanel(wxPanel):
     def OnTestGetSelection(self, evt):
         start, end = self.tc.GetSelection()
         text = self.tc.GetValue()
-        # Looks like a bug here, but only if not wxTE_RICH...
-        if wxPlatform == "__WXMSW__":
+        if wxPlatform == "__WXMSW__":  # This is why GetStringSelection was added
             text = string.replace(text, '\n', '\r\n')
-        self.log.write("GetSelection(): (%d, %d)\n\tSelectedText: %s\n" %
-                       (start, end, repr(text[start:end])))
+        self.log.write("GetSelection(): (%d, %d)\n"
+                       "\tGetStringSelection(): %s\n"
+                       "\tSelectedText: %s\n" %
+                       (start, end,
+                        self.tc.GetStringSelection(),
+                        repr(text[start:end])))
 
 
 #---------------------------------------------------------------------------
@@ -110,3 +110,12 @@ def runTest(frame, nb, log):
 
 overview = """\
 """
+
+
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+