wxPython updates for new wxSTC

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

diff --git a/wxPython/demo/wxStyledTextCtrl_2.py b/wxPython/demo/wxStyledTextCtrl_2.py
index c2c7ae4855ccd8ab555f812becd1134fbf747296..2b102cc294871cac09d11ce1cf7229995377611c 100644 (file)
--- a/wxPython/demo/wxStyledTextCtrl_2.py
+++ b/wxPython/demo/wxStyledTextCtrl_2.py
@@ -21,16 +21,16 @@ if wxPlatform == '__WXMSW__':
               'mono' : 'Courier New',
               'helv' : 'Arial',
               'other': 'Comic Sans MS',
               'mono' : 'Courier New',
               'helv' : 'Arial',
               'other': 'Comic Sans MS',

-              'size' : 8,
-              'size2': 6,
+              'size' : 10,
+              'size2': 8,

              }
 else:
     faces = { 'times': 'Times',
               'mono' : 'Courier',
               'helv' : 'Helvetica',
               'other': 'new century schoolbook',
              }
 else:
     faces = { 'times': 'Times',
               'mono' : 'Courier',
               'helv' : 'Helvetica',
               'other': 'new century schoolbook',

-              'size' : 11,
-              'size2': 9,
+              'size' : 13,
+              'size2': 11,

              }
 
 
              }
 
 


@@ -40,14 +40,17 @@ class PythonSTC(wxStyledTextCtrl):
     def __init__(self, parent, ID):
         wxStyledTextCtrl.__init__(self, parent, ID)
 
     def __init__(self, parent, ID):
         wxStyledTextCtrl.__init__(self, parent, ID)
 

+        self.CmdKeyAssign(ord('B'), wxSTC_SCMOD_CTRL, wxSTC_CMD_ZOOMIN)
+        self.CmdKeyAssign(ord('N'), wxSTC_SCMOD_CTRL, wxSTC_CMD_ZOOMOUT)
+

         self.SetLexer(wxSTC_LEX_PYTHON)
         self.SetLexer(wxSTC_LEX_PYTHON)

-        self.SetKeywords(0, string.join(keyword.kwlist))
+        self.SetKeyWords(0, string.join(keyword.kwlist))

 
         self.SetProperty("fold", "1")
         self.SetProperty("tab.timmy.whinge.level", "1")
         self.SetMargins(0,0)
 
 
         self.SetProperty("fold", "1")
         self.SetProperty("tab.timmy.whinge.level", "1")
         self.SetMargins(0,0)
 

-        self.SetViewWhitespace(false)
+        self.SetViewWhiteSpace(false)

         #self.SetBufferedDraw(false)
 
         self.SetEdgeMode(wxSTC_EDGE_BACKGROUND)
         #self.SetBufferedDraw(false)
 
         self.SetEdgeMode(wxSTC_EDGE_BACKGROUND)


@@ -82,33 +85,33 @@ class PythonSTC(wxStyledTextCtrl):
 
         # Python styles
         # White space
 
         # Python styles
         # White space

-        self.StyleSetSpec(SCE_P_DEFAULT, "fore:#808080")
+        self.StyleSetSpec(wxSTC_P_DEFAULT, "fore:#808080,face:%(helv)s,size:%(size)d" % faces)

         # Comment
         # Comment

-        self.StyleSetSpec(SCE_P_COMMENTLINE, "fore:#007F00,face:%(other)s" % faces)
+        self.StyleSetSpec(wxSTC_P_COMMENTLINE, "fore:#007F00,face:%(other)s,size:%(size)d" % faces)

         # Number
         # Number

-        self.StyleSetSpec(SCE_P_NUMBER, "fore:#007F7F")
+        self.StyleSetSpec(wxSTC_P_NUMBER, "fore:#007F7F,size:%(size)d" % faces)

         # String
         # String

-        self.StyleSetSpec(SCE_P_STRING, "fore:#7F007F,italic,face:%(times)s" % faces)
+        self.StyleSetSpec(wxSTC_P_STRING, "fore:#7F007F,italic,face:%(times)s,size:%(size)d" % faces)

         # Single quoted string
         # Single quoted string

-        self.StyleSetSpec(SCE_P_CHARACTER, "fore:#7F007F,italic,face:%(times)s" % faces)
+        self.StyleSetSpec(wxSTC_P_CHARACTER, "fore:#7F007F,italic,face:%(times)s,size:%(size)d" % faces)

         # Keyword
         # Keyword

-        self.StyleSetSpec(SCE_P_WORD, "fore:#00007F,bold")
+        self.StyleSetSpec(wxSTC_P_WORD, "fore:#00007F,bold,size:%(size)d" % faces)

         # Triple quotes
         # Triple quotes

-        self.StyleSetSpec(SCE_P_TRIPLE, "fore:#7F0000")
+        self.StyleSetSpec(wxSTC_P_TRIPLE, "fore:#7F0000,size:%(size)d" % faces)

         # Triple double quotes
         # Triple double quotes

-        self.StyleSetSpec(SCE_P_TRIPLEDOUBLE, "fore:#7F0000")
+        self.StyleSetSpec(wxSTC_P_TRIPLEDOUBLE, "fore:#7F0000,size:%(size)d" % faces)

         # Class name definition
         # Class name definition

-        self.StyleSetSpec(SCE_P_CLASSNAME, "fore:#0000FF,bold,underline")
+        self.StyleSetSpec(wxSTC_P_CLASSNAME, "fore:#0000FF,bold,underline,size:%(size)d" % faces)

         # Function or method name definition
         # Function or method name definition

-        self.StyleSetSpec(SCE_P_DEFNAME, "fore:#007F7F,bold")
+        self.StyleSetSpec(wxSTC_P_DEFNAME, "fore:#007F7F,bold,size:%(size)d" % faces)

         # Operators
         # Operators

-        self.StyleSetSpec(SCE_P_OPERATOR, "bold")
+        self.StyleSetSpec(wxSTC_P_OPERATOR, "bold,size:%(size)d" % faces)

         # Identifiers
         # Identifiers

-        #self.StyleSetSpec(SCE_P_IDENTIFIER, "bold")#,fore:#FF00FF")
+        self.StyleSetSpec(wxSTC_P_IDENTIFIER, "fore:#808080,face:%(helv)s,size:%(size)d" % faces)

         # Comment-blocks
         # Comment-blocks

-        self.StyleSetSpec(SCE_P_COMMENTBLOCK, "fore:#7F7F7F")
+        self.StyleSetSpec(wxSTC_P_COMMENTBLOCK, "fore:#7F7F7F,size:%(size)d" % faces)

         # End of line where string is not closed
         # End of line where string is not closed

-        self.StyleSetSpec(SCE_P_STRINGEOL, "fore:#000000,face:%(mono)s,back:#E0C0E0,eolfilled" % faces)
+        self.StyleSetSpec(wxSTC_P_STRINGEOL, "fore:#000000,face:%(mono)s,back:#E0C0E0,eolfilled,size:%(size)d" % faces)

 
 
         self.SetCaretForeground("BLUE")
 
 
         self.SetCaretForeground("BLUE")


@@ -126,8 +129,29 @@ class PythonSTC(wxStyledTextCtrl):
                 self.CallTipShow(pos, 'param1, param2')
             # Code completion
             else:
                 self.CallTipShow(pos, 'param1, param2')
             # Code completion
             else:

-                self.AutoCompShow('I love wxPython a b c')
-
+                #lst = []
+                #for x in range(50000):
+                #    lst.append('%05d' % x)
+                #st = string.join(lst)
+                #print len(st)
+                #self.AutoCompShow(0, st)
+
+                kw = keyword.kwlist[:]
+                kw.append("zzzzzz")
+                kw.append("aaaaa")
+                kw.append("__init__")
+                kw.append("zzaaaaa")
+                kw.append("zZaaaaa")
+                kw.append("this_is_a_longer_value")
+                kw.append("this_is_a_much_much_much_much_much_much_much_longer_value")
+
+                #kw.sort()
+
+                self.AutoCompSetIgnoreCase(true)
+                self.AutoCompShow(0, string.join(kw))
+                #self.AutoCompSelect('br')
+        else:
+            event.Skip()

 
 
     def OnUpdateUI(self, evt):
 
 
     def OnUpdateUI(self, evt):


@@ -141,21 +165,21 @@ class PythonSTC(wxStyledTextCtrl):
             styleBefore = self.GetStyleAt(caretPos - 1)
 
         # check before
             styleBefore = self.GetStyleAt(caretPos - 1)
 
         # check before

-        if charBefore and charBefore in "[]{}()" and ord(styleBefore) == SCE_P_OPERATOR:
+        if charBefore and chr(charBefore) in "[]{}()" and styleBefore == wxSTC_P_OPERATOR:

             braceAtCaret = caretPos - 1
 
         # check after
         if braceAtCaret < 0:
             charAfter = self.GetCharAt(caretPos)
             styleAfter = self.GetStyleAt(caretPos)
             braceAtCaret = caretPos - 1
 
         # check after
         if braceAtCaret < 0:
             charAfter = self.GetCharAt(caretPos)
             styleAfter = self.GetStyleAt(caretPos)

-            if charAfter and charAfter in "[]{}()" and ord(styleAfter) == SCE_P_OPERATOR:
+            if charAfter and chr(charAfter) in "[]{}()" and styleAfter == wxSTC_P_OPERATOR:

                 braceAtCaret = caretPos
 
         if braceAtCaret >= 0:
             braceOpposite = self.BraceMatch(braceAtCaret)
 
         if braceAtCaret != -1  and braceOpposite == -1:
                 braceAtCaret = caretPos
 
         if braceAtCaret >= 0:
             braceOpposite = self.BraceMatch(braceAtCaret)
 
         if braceAtCaret != -1  and braceOpposite == -1:

-            self.BraceBadlight(braceAtCaret)
+            self.BraceBadLight(braceAtCaret)

         else:
             self.BraceHighlight(braceAtCaret, braceOpposite)
             #pt = self.PointFromPosition(braceOpposite)
         else:
             self.BraceHighlight(braceAtCaret, braceOpposite)
             #pt = self.PointFromPosition(braceOpposite)


@@ -170,7 +194,7 @@ class PythonSTC(wxStyledTextCtrl):
             if evt.GetShift() and evt.GetControl():
                 self.FoldAll()
             else:
             if evt.GetShift() and evt.GetControl():
                 self.FoldAll()
             else:

-                lineClicked = self.GetLineFromPos(evt.GetPosition())
+                lineClicked = self.LineFromPosition(evt.GetPosition())

                 if self.GetFoldLevel(lineClicked) & wxSTC_FOLDLEVELHEADERFLAG:
                     if evt.GetShift():
                         self.SetFoldExpanded(lineClicked, true)
                 if self.GetFoldLevel(lineClicked) & wxSTC_FOLDLEVELHEADERFLAG:
                     if evt.GetShift():
                         self.SetFoldExpanded(lineClicked, true)


@@ -253,18 +277,29 @@ class PythonSTC(wxStyledTextCtrl):
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 

+_USE_PANEL = 1
+

 def runTest(frame, nb, log):
 def runTest(frame, nb, log):

-    ed = PythonSTC(nb, -1)
+    if not _USE_PANEL:
+        ed = p = PythonSTC(nb, -1)
+    else:
+        p = wxPanel(nb, -1)
+        ed = PythonSTC(p, -1)
+        s = wxBoxSizer(wxHORIZONTAL)
+        s.Add(ed, 1, wxEXPAND)
+        p.SetSizer(s)
+        p.SetAutoLayout(true)
+

 
     ed.SetText(demoText + open('Main.py').read())
     ed.EmptyUndoBuffer()
 
     ed.SetText(demoText + open('Main.py').read())
     ed.EmptyUndoBuffer()

-
+    ed.Colourise(0, -1)

 
     # line numbers in the margin
     ed.SetMarginType(1, wxSTC_MARGIN_NUMBER)
     ed.SetMarginWidth(1, 25)
 
 
     # line numbers in the margin
     ed.SetMarginType(1, wxSTC_MARGIN_NUMBER)
     ed.SetMarginWidth(1, 25)
 

-    return ed
+    return p

 
 
 
 
 
 


@@ -273,7 +308,7 @@ def runTest(frame, nb, log):
 
 overview = """\
 <html><body>
 
 overview = """\
 <html><body>

-Once again, no docs yet.  <b>Sorry.</b>  But <a href="data/stc.h">this</a>
+Once again, no docs yet.  <b>Sorry.</b>  But <a href="data/stc.h.html">this</a>

 and <a href="http://www.scintilla.org/ScintillaDoc.html">this</a> should
 be helpful.
 </body><html>
 and <a href="http://www.scintilla.org/ScintillaDoc.html">this</a> should
 be helpful.
 </body><html>