X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..b6e5eaa59701315ca06996ff845872ca4122695f:/wxPython/demo/wxStyledTextCtrl_1.py

diff --git a/wxPython/demo/wxStyledTextCtrl_1.py b/wxPython/demo/wxStyledTextCtrl_1.py
index 7fab856c7c..eb55ea356c 100644
--- a/wxPython/demo/wxStyledTextCtrl_1.py
+++ b/wxPython/demo/wxStyledTextCtrl_1.py
@@ -30,7 +30,6 @@ wxStyledTextEditor also supports setting markers in the margin...
 you want in your application.  Cut, Copy, Paste, Drag and Drop of
 text works, as well as virtually unlimited Undo and Redo
 capabilities, (right click to try it out.)
-
 """
 
 if wxPlatform == '__WXMSW__':
@@ -96,8 +95,19 @@ class MySTC(wxStyledTextCtrl):
 
 #----------------------------------------------------------------------
 
+_USE_PANEL = 1
+
 def runTest(frame, nb, log):
-    ed = MySTC(nb, -1, log)
+    if not _USE_PANEL:
+        ed = p = MySTC(nb, -1, log)
+
+    else:
+        p = wxPanel(nb, -1)
+        ed = MySTC(p, -1, log)
+        s = wxBoxSizer(wxHORIZONTAL)
+        s.Add(ed, 1, wxEXPAND)
+        p.SetSizer(s)
+        p.SetAutoLayout(true)
 
     ed.SetText(demoText)
     ed.EmptyUndoBuffer()
@@ -113,15 +123,15 @@ def runTest(frame, nb, log):
     # now set some text to those styles...  Normally this would be
     # done in an event handler that happens when text needs displayed.
     ed.StartStyling(98, 0xff)
-    ed.SetStyleFor(6, 1)  # set style for 6 characters using style 1
+    ed.SetStyling(6, 1)  # set style for 6 characters using style 1
 
     ed.StartStyling(190, 0xff)
-    ed.SetStyleFor(20, 2)
+    ed.SetStyling(20, 2)
 
     ed.StartStyling(310, 0xff)
-    ed.SetStyleFor(4, 3)
-    ed.SetStyleFor(2, 0)
-    ed.SetStyleFor(10, 4)
+    ed.SetStyling(4, 3)
+    ed.SetStyling(2, 0)
+    ed.SetStyling(10, 4)
 
 
     # line numbers in the margin
@@ -146,19 +156,35 @@ def runTest(frame, nb, log):
 
     # and finally, an indicator or two
     ed.IndicatorSetStyle(0, wxSTC_INDIC_SQUIGGLE)
-    ed.IndicatorSetColour(0, wxRED)
+    ed.IndicatorSetForeground(0, wxRED)
     ed.IndicatorSetStyle(1, wxSTC_INDIC_DIAGONAL)
-    ed.IndicatorSetColour(1, wxBLUE)
+    ed.IndicatorSetForeground(1, wxBLUE)
     ed.IndicatorSetStyle(2, wxSTC_INDIC_STRIKE)
-    ed.IndicatorSetColour(2, wxRED)
+    ed.IndicatorSetForeground(2, wxRED)
 
     ed.StartStyling(836, wxSTC_INDICS_MASK)
-    ed.SetStyleFor(10, wxSTC_INDIC0_MASK)
-    ed.SetStyleFor(10, wxSTC_INDIC1_MASK)
-    ed.SetStyleFor(10, wxSTC_INDIC2_MASK | wxSTC_INDIC1_MASK)
-
-
-    return ed
+    ed.SetStyling(10, wxSTC_INDIC0_MASK)
+    ed.SetStyling(10, wxSTC_INDIC1_MASK)
+    ed.SetStyling(10, wxSTC_INDIC2_MASK | wxSTC_INDIC1_MASK)
+
+    # some test stuff...
+    if 1:
+        print "GetTextLength(): ", ed.GetTextLength(), len(ed.GetText())
+        print "GetText(): ", repr(ed.GetText())
+        print
+        print "GetStyledText(98, 104): ", repr(ed.GetStyledText(98, 104)), len(ed.GetStyledText(98, 104))
+        print
+        print "GetCurLine(): ", repr(ed.GetCurLine())
+        print
+        print "GetLine(1): ", repr(ed.GetLine(1))
+        print
+        ed.SetSelection(25, 35)
+        print "GetSelectedText(): ", repr(ed.GetSelectedText())
+        print "GetTextRange(25, 35): ", repr(ed.GetTextRange(25, 35))
+
+        ed.GotoPos(0)
+
+    return p