X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c368d904fc27d35ae1e533155e2154dc496432e4..a132a1c810bea2d37b09f01524b57440c968de1c:/wxPython/demo/wxTextCtrl.py?ds=sidebyside

diff --git a/wxPython/demo/wxTextCtrl.py b/wxPython/demo/wxTextCtrl.py
index 8936d34de4..58d25e7d3a 100644
--- a/wxPython/demo/wxTextCtrl.py
+++ b/wxPython/demo/wxTextCtrl.py
@@ -1,4 +1,4 @@
-
+import sys
 from wxPython.wx import *
 
 #---------------------------------------------------------------------------
@@ -8,23 +8,48 @@ class TestPanel(wxPanel):
         wxPanel.__init__(self, parent, -1)
         self.log = log
 
-        wxStaticText(self, -1, "wxTextCtrl", wxPoint(5, 25), wxSize(75, 20))
-        t = wxTextCtrl(self, 10, "Test it out and see", wxPoint(80, 25), wxSize(150, 20))
-        t.SetInsertionPoint(0)
+        l1 = wxStaticText(self, -1, "wxTextCtrl")
+        t1 = wxTextCtrl(self, 10, "Test it out and see", size=(125, -1))
+        t1.SetInsertionPoint(0)
         EVT_TEXT(self, 10, self.EvtText)
-        EVT_CHAR(t, self.EvtChar)
+        EVT_CHAR(t1, self.EvtChar)
 
 
-        wxStaticText(self, -1, "Passsword", wxPoint(5, 50), wxSize(75, 20))
-        wxTextCtrl(self, 20, "", wxPoint(80, 50), wxSize(150, 20), wxTE_PASSWORD)
+        l2 = wxStaticText(self, -1, "Passsword")
+        t2 = wxTextCtrl(self, 20, "", size=(125, -1), style=wxTE_PASSWORD)
         EVT_TEXT(self, 20, self.EvtText)
 
-        wxStaticText(self, -1, "Multi-line", wxPoint(5, 75), wxSize(75, 20))
-        t = wxTextCtrl(self, 30, "How does it work with a long line of text set in the control",
-                       wxPoint(80, 75), wxSize(200, 150), wxTE_MULTILINE)
-        t.SetInsertionPoint(0)
+        l3 = wxStaticText(self, -1, "Multi-line")
+        t3 = wxTextCtrl(self, 30, "How does it work with a long line of text set in the control",
+                       size=(200, 100), style=wxTE_MULTILINE)
+        t3.SetInsertionPoint(0)
         EVT_TEXT(self, 30, self.EvtText)
 
+        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)
+        t4.SetInsertionPoint(0)
+        t4.SetStyle(44, 47, wxTextAttr("RED", "YELLOW"))
+
+        points = t4.GetFont().GetPointSize()  # get the current size
+        f = wxFont(points+2, 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)
+
+        sizer = wxFlexGridSizer(cols=2, hgap=6, vgap=6)
+        sizer.AddMany([ l1, t1,
+                        l2, t2,
+                        l3, t3,
+                        l4, t4,
+                        ])
+        border = wxBoxSizer(wxVERTICAL)
+        border.Add(sizer, 0, wxALL, 25)
+        self.SetSizer(border)
+        self.SetAutoLayout(true)
+
+
     def EvtText(self, event):
         self.log.WriteText('EvtText: %s\n' % event.GetString())