Applied patch [ 827011 ] Event-based processing of item tooltips in wxTreeCtrl

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

diff --git a/wxPython/demo/wxStyledTextCtrl_2.py b/wxPython/demo/wxStyledTextCtrl_2.py
index 81de04da756fd548a86e34eb3e8937c1a1adfe67..642ed9fd85ff37d4110a78a262af82df28dc687a 100644 (file)
--- a/wxPython/demo/wxStyledTextCtrl_2.py
+++ b/wxPython/demo/wxStyledTextCtrl_2.py
@@ -1,8 +1,14 @@
+# 11/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# 

 
 

-from wxPython.wx import *
-from wxPython.stc import *
-import images
-import keyword
+import  keyword
+
+import  wx
+import  wx.stc  as  stc
+
+import  images

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


@@ -16,7 +22,7 @@ demoText = """\
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 
 

-if wxPlatform == '__WXMSW__':
+if wx.Platform == '__WXMSW__':

     faces = { 'times': 'Times New Roman',
               'mono' : 'Courier New',
               'helv' : 'Arial',
     faces = { 'times': 'Times New Roman',
               'mono' : 'Courier New',
               'helv' : 'Arial',


@@ -36,15 +42,18 @@ else:
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 

-class PythonSTC(wxStyledTextCtrl):
+class PythonSTC(stc.StyledTextCtrl):
+
+    fold_symbols = 2
+    

     def __init__(self, parent, ID):
     def __init__(self, parent, ID):

-        wxStyledTextCtrl.__init__(self, parent, ID,
-                                  style = wxNO_FULL_REPAINT_ON_RESIZE)
+        stc.StyledTextCtrl.__init__(self, parent, ID,
+                                  style = wx.NO_FULL_REPAINT_ON_RESIZE)

 
 

-        self.CmdKeyAssign(ord('B'), wxSTC_SCMOD_CTRL, wxSTC_CMD_ZOOMIN)
-        self.CmdKeyAssign(ord('N'), wxSTC_SCMOD_CTRL, wxSTC_CMD_ZOOMOUT)
+        self.CmdKeyAssign(ord('B'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMIN)
+        self.CmdKeyAssign(ord('N'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMOUT)

 
 

-        self.SetLexer(wxSTC_LEX_PYTHON)
+        self.SetLexer(stc.STC_LEX_PYTHON)

         self.SetKeyWords(0, " ".join(keyword.kwlist))
 
         self.SetProperty("fold", "1")
         self.SetKeyWords(0, " ".join(keyword.kwlist))
 
         self.SetProperty("fold", "1")


@@ -55,82 +64,105 @@ class PythonSTC(wxStyledTextCtrl):
         #self.SetBufferedDraw(False)
         #self.SetViewEOL(True)
 
         #self.SetBufferedDraw(False)
         #self.SetViewEOL(True)
 

-        self.SetEdgeMode(wxSTC_EDGE_BACKGROUND)
+        self.SetEdgeMode(stc.STC_EDGE_BACKGROUND)

         self.SetEdgeColumn(78)
 
         # Setup a margin to hold fold markers
         #self.SetFoldFlags(16)  ###  WHAT IS THIS VALUE?  WHAT ARE THE OTHER FLAGS?  DOES IT MATTER?
         self.SetEdgeColumn(78)
 
         # Setup a margin to hold fold markers
         #self.SetFoldFlags(16)  ###  WHAT IS THIS VALUE?  WHAT ARE THE OTHER FLAGS?  DOES IT MATTER?

-        self.SetMarginType(2, wxSTC_MARGIN_SYMBOL)
-        self.SetMarginMask(2, wxSTC_MASK_FOLDERS)
+        self.SetMarginType(2, stc.STC_MARGIN_SYMBOL)
+        self.SetMarginMask(2, stc.STC_MASK_FOLDERS)

         self.SetMarginSensitive(2, True)
         self.SetMarginWidth(2, 12)
 
         self.SetMarginSensitive(2, True)
         self.SetMarginWidth(2, 12)
 

-        if 0: # simple folder marks, like the old version
-            self.MarkerDefine(wxSTC_MARKNUM_FOLDER, wxSTC_MARK_ARROW, "navy", "navy")
-            self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_ARROWDOWN, "navy", "navy")
-            # Set these to an invisible mark
-            self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_BACKGROUND, "white", "black")
-            self.MarkerDefine(wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_BACKGROUND, "white", "black")
-            self.MarkerDefine(wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_BACKGROUND, "white", "black")
-            self.MarkerDefine(wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_BACKGROUND, "white", "black")
-
-        else: # more involved "outlining" folder marks
-            self.MarkerDefine(wxSTC_MARKNUM_FOLDEREND,     wxSTC_MARK_BOXPLUSCONNECTED,  "white", "black")
-            self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_BOXMINUSCONNECTED, "white", "black")
-            self.MarkerDefine(wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_TCORNER,  "white", "black")
-            self.MarkerDefine(wxSTC_MARKNUM_FOLDERTAIL,    wxSTC_MARK_LCORNER,  "white", "black")
-            self.MarkerDefine(wxSTC_MARKNUM_FOLDERSUB,     wxSTC_MARK_VLINE,    "white", "black")
-            self.MarkerDefine(wxSTC_MARKNUM_FOLDER,        wxSTC_MARK_BOXPLUS,  "white", "black")
-            self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN,    wxSTC_MARK_BOXMINUS, "white", "black")
-
-
-        EVT_STC_UPDATEUI(self,    ID, self.OnUpdateUI)
-        EVT_STC_MARGINCLICK(self, ID, self.OnMarginClick)
-        EVT_KEY_DOWN(self, self.OnKeyPressed)
-
+        if self.fold_symbols == 0:
+            # Arrow pointing right for contracted folders, arrow pointing down for expanded
+            self.MarkerDefine(stc.STC_MARKNUM_FOLDEROPEN,    stc.STC_MARK_ARROWDOWN, "black", "black");
+            self.MarkerDefine(stc.STC_MARKNUM_FOLDER,        stc.STC_MARK_ARROW, "black", "black");
+            self.MarkerDefine(stc.STC_MARKNUM_FOLDERSUB,     stc.STC_MARK_EMPTY, "black", "black");
+            self.MarkerDefine(stc.STC_MARKNUM_FOLDERTAIL,    stc.STC_MARK_EMPTY, "black", "black");
+            self.MarkerDefine(stc.STC_MARKNUM_FOLDEREND,     stc.STC_MARK_EMPTY,     "white", "black");
+            self.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_EMPTY,     "white", "black");
+            self.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_EMPTY,     "white", "black");
+            
+        elif self.fold_symbols == 1:
+            # Plus for contracted folders, minus for expanded
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN,    wxSTC_MARK_MINUS, "white", "black");
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDER,        wxSTC_MARK_PLUS,  "white", "black");
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDERSUB,     wxSTC_MARK_EMPTY, "white", "black");
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDERTAIL,    wxSTC_MARK_EMPTY, "white", "black");
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDEREND,     wxSTC_MARK_EMPTY, "white", "black");
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_EMPTY, "white", "black");
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_EMPTY, "white", "black");
+
+       elif self.fold_symbols == 2:
+            # Like a flattened tree control using circular headers and curved joins
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN,    wxSTC_MARK_CIRCLEMINUS,          "white", "#404040");
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDER,        wxSTC_MARK_CIRCLEPLUS,           "white", "#404040");
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDERSUB,     wxSTC_MARK_VLINE,                "white", "#404040");
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDERTAIL,    wxSTC_MARK_LCORNERCURVE,         "white", "#404040");
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDEREND,     wxSTC_MARK_CIRCLEPLUSCONNECTED,  "white", "#404040");
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_CIRCLEMINUSCONNECTED, "white", "#404040");
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_TCORNERCURVE,         "white", "#404040");
+
+        elif self.fold_symbols == 3:
+            # Like a flattened tree control using square headers
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN,    wxSTC_MARK_BOXMINUS,          "white", "#808080")
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDER,        wxSTC_MARK_BOXPLUS,           "white", "#808080")
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDERSUB,     wxSTC_MARK_VLINE,             "white", "#808080")
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDERTAIL,    wxSTC_MARK_LCORNER,           "white", "#808080")
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDEREND,     wxSTC_MARK_BOXPLUSCONNECTED,  "white", "#808080")
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_BOXMINUSCONNECTED, "white", "#808080")
+            self.MarkerDefine(wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_TCORNER,           "white", "#808080")
+
+
+        self.Bind(stc.EVT_STC_UPDATEUI, self.OnUpdateUI)
+        self.Bind(stc.EVT_STC_MARGINCLICK, self.OnMarginClick)
+        self.Bind(wx.EVT_KEY_DOWN, self.OnKeyPressed)

 
         # Make some styles,  The lexer defines what each style is used for, we
         # just have to define what each style looks like.  This set is adapted from
         # Scintilla sample property files.
 
 
         # Make some styles,  The lexer defines what each style is used for, we
         # just have to define what each style looks like.  This set is adapted from
         # Scintilla sample property files.
 

-        self.StyleClearAll()
+        # Global default styles for all languages
+        self.StyleSetSpec(stc.STC_STYLE_DEFAULT,     "face:%(helv)s,size:%(size)d" % faces)
+        self.StyleClearAll()  # Reset all to be like the default

 
         # Global default styles for all languages
 
         # Global default styles for all languages

-        self.StyleSetSpec(wxSTC_STYLE_DEFAULT,     "face:%(helv)s,size:%(size)d" % faces)
-        self.StyleSetSpec(wxSTC_STYLE_LINENUMBER,  "back:#C0C0C0,face:%(helv)s,size:%(size2)d" % faces)
-        self.StyleSetSpec(wxSTC_STYLE_CONTROLCHAR, "face:%(other)s" % faces)
-        self.StyleSetSpec(wxSTC_STYLE_BRACELIGHT,  "fore:#FFFFFF,back:#0000FF,bold")
-        self.StyleSetSpec(wxSTC_STYLE_BRACEBAD,    "fore:#000000,back:#FF0000,bold")
+        self.StyleSetSpec(stc.STC_STYLE_DEFAULT,     "face:%(helv)s,size:%(size)d" % faces)
+        self.StyleSetSpec(stc.STC_STYLE_LINENUMBER,  "back:#C0C0C0,face:%(helv)s,size:%(size2)d" % faces)
+        self.StyleSetSpec(stc.STC_STYLE_CONTROLCHAR, "face:%(other)s" % faces)
+        self.StyleSetSpec(stc.STC_STYLE_BRACELIGHT,  "fore:#FFFFFF,back:#0000FF,bold")
+        self.StyleSetSpec(stc.STC_STYLE_BRACEBAD,    "fore:#000000,back:#FF0000,bold")

 
         # Python styles
 
         # Python styles

-        # White space
-        self.StyleSetSpec(wxSTC_P_DEFAULT, "fore:#808080,face:%(helv)s,size:%(size)d" % faces)
-        # Comment
-        self.StyleSetSpec(wxSTC_P_COMMENTLINE, "fore:#007F00,face:%(other)s,size:%(size)d" % faces)
+        # Default 
+        self.StyleSetSpec(stc.STC_P_DEFAULT, "fore:#000000,face:%(helv)s,size:%(size)d" % faces)
+        # Comments
+        self.StyleSetSpec(stc.STC_P_COMMENTLINE, "fore:#007F00,face:%(other)s,size:%(size)d" % faces)

         # Number
         # Number

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

         # String
         # String

-        self.StyleSetSpec(wxSTC_P_STRING, "fore:#7F007F,face:%(helv)s,size:%(size)d" % faces)
+        self.StyleSetSpec(stc.STC_P_STRING, "fore:#7F007F,face:%(helv)s,size:%(size)d" % faces)

         # Single quoted string
         # Single quoted string

-        self.StyleSetSpec(wxSTC_P_CHARACTER, "fore:#7F007F,face:%(helv)s,size:%(size)d" % faces)
+        self.StyleSetSpec(stc.STC_P_CHARACTER, "fore:#7F007F,face:%(helv)s,size:%(size)d" % faces)

         # Keyword
         # Keyword

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

         # Triple quotes
         # Triple quotes

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

         # Triple double quotes
         # Triple double quotes

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

         # Class name definition
         # Class name definition

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

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

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

         # Operators
         # Operators

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

         # Identifiers
         # Identifiers

-        self.StyleSetSpec(wxSTC_P_IDENTIFIER, "fore:#808080,face:%(helv)s,size:%(size)d" % faces)
+        self.StyleSetSpec(stc.STC_P_IDENTIFIER, "fore:#000000,face:%(helv)s,size:%(size)d" % faces)

         # Comment-blocks
         # Comment-blocks

-        self.StyleSetSpec(wxSTC_P_COMMENTBLOCK, "fore:#7F7F7F,size:%(size)d" % faces)
+        self.StyleSetSpec(stc.STC_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(wxSTC_P_STRINGEOL, "fore:#000000,face:%(mono)s,back:#E0C0E0,eol,size:%(size)d" % faces)
+        self.StyleSetSpec(stc.STC_P_STRINGEOL, "fore:#000000,face:%(mono)s,back:#E0C0E0,eol,size:%(size)d" % faces)

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


@@ -141,14 +173,14 @@ class PythonSTC(wxStyledTextCtrl):
         self.RegisterImage(3, images.getCopy2Bitmap())
 
 
         self.RegisterImage(3, images.getCopy2Bitmap())
 
 

-
-

     def OnKeyPressed(self, event):
         if self.CallTipActive():
             self.CallTipCancel()
         key = event.KeyCode()
     def OnKeyPressed(self, event):
         if self.CallTipActive():
             self.CallTipCancel()
         key = event.KeyCode()

+

         if key == 32 and event.ControlDown():
             pos = self.GetCurrentPos()
         if key == 32 and event.ControlDown():
             pos = self.GetCurrentPos()

+

             # Tips
             if event.ShiftDown():
                 self.CallTipSetBackground("yellow")
             # Tips
             if event.ShiftDown():
                 self.CallTipSetBackground("yellow")


@@ -192,19 +224,21 @@ class PythonSTC(wxStyledTextCtrl):
         braceOpposite = -1
         charBefore = None
         caretPos = self.GetCurrentPos()
         braceOpposite = -1
         charBefore = None
         caretPos = self.GetCurrentPos()

+

         if caretPos > 0:
             charBefore = self.GetCharAt(caretPos - 1)
             styleBefore = self.GetStyleAt(caretPos - 1)
 
         # check before
         if caretPos > 0:
             charBefore = self.GetCharAt(caretPos - 1)
             styleBefore = self.GetStyleAt(caretPos - 1)
 
         # check before

-        if charBefore and chr(charBefore) in "[]{}()" and styleBefore == wxSTC_P_OPERATOR:
+        if charBefore and chr(charBefore) in "[]{}()" and styleBefore == stc.STC_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 chr(charAfter) in "[]{}()" and styleAfter == wxSTC_P_OPERATOR:
+
+            if charAfter and chr(charAfter) in "[]{}()" and styleAfter == stc.STC_P_OPERATOR:

                 braceAtCaret = caretPos
 
         if braceAtCaret >= 0:
                 braceAtCaret = caretPos
 
         if braceAtCaret >= 0:


@@ -227,7 +261,8 @@ class PythonSTC(wxStyledTextCtrl):
                 self.FoldAll()
             else:
                 lineClicked = self.LineFromPosition(evt.GetPosition())
                 self.FoldAll()
             else:
                 lineClicked = self.LineFromPosition(evt.GetPosition())

-                if self.GetFoldLevel(lineClicked) & wxSTC_FOLDLEVELHEADERFLAG:
+
+                if self.GetFoldLevel(lineClicked) & stc.STC_FOLDLEVELHEADERFLAG:

                     if evt.GetShift():
                         self.SetFoldExpanded(lineClicked, True)
                         self.Expand(lineClicked, True, True, 1)
                     if evt.GetShift():
                         self.SetFoldExpanded(lineClicked, True)
                         self.Expand(lineClicked, True, True, 1)


@@ -248,15 +283,16 @@ class PythonSTC(wxStyledTextCtrl):
 
         # find out if we are folding or unfolding
         for lineNum in range(lineCount):
 
         # find out if we are folding or unfolding
         for lineNum in range(lineCount):

-            if self.GetFoldLevel(lineNum) & wxSTC_FOLDLEVELHEADERFLAG:
+            if self.GetFoldLevel(lineNum) & stc.STC_FOLDLEVELHEADERFLAG:

                 expanding = not self.GetFoldExpanded(lineNum)
                 break;
 
         lineNum = 0
                 expanding = not self.GetFoldExpanded(lineNum)
                 break;
 
         lineNum = 0

+

         while lineNum < lineCount:
             level = self.GetFoldLevel(lineNum)
         while lineNum < lineCount:
             level = self.GetFoldLevel(lineNum)

-            if level & wxSTC_FOLDLEVELHEADERFLAG and \
-               (level & wxSTC_FOLDLEVELNUMBERMASK) == wxSTC_FOLDLEVELBASE:
+            if level & stc.STC_FOLDLEVELHEADERFLAG and \
+               (level & stc.STC_FOLDLEVELNUMBERMASK) == stc.STC_FOLDLEVELBASE:

 
                 if expanding:
                     self.SetFoldExpanded(lineNum, True)
 
                 if expanding:
                     self.SetFoldExpanded(lineNum, True)


@@ -265,6 +301,7 @@ class PythonSTC(wxStyledTextCtrl):
                 else:
                     lastChild = self.GetLastChild(lineNum, -1)
                     self.SetFoldExpanded(lineNum, False)
                 else:
                     lastChild = self.GetLastChild(lineNum, -1)
                     self.SetFoldExpanded(lineNum, False)

+

                     if lastChild > lineNum:
                         self.HideLines(lineNum+1, lastChild)
 
                     if lastChild > lineNum:
                         self.HideLines(lineNum+1, lastChild)
 


@@ -275,6 +312,7 @@ class PythonSTC(wxStyledTextCtrl):
     def Expand(self, line, doExpand, force=False, visLevels=0, level=-1):
         lastChild = self.GetLastChild(line, level)
         line = line + 1
     def Expand(self, line, doExpand, force=False, visLevels=0, level=-1):
         lastChild = self.GetLastChild(line, level)
         line = line + 1

+

         while line <= lastChild:
             if force:
                 if visLevels > 0:
         while line <= lastChild:
             if force:
                 if visLevels > 0:


@@ -288,12 +326,13 @@ class PythonSTC(wxStyledTextCtrl):
             if level == -1:
                 level = self.GetFoldLevel(line)
 
             if level == -1:
                 level = self.GetFoldLevel(line)
 

-            if level & wxSTC_FOLDLEVELHEADERFLAG:
+            if level & stc.STC_FOLDLEVELHEADERFLAG:

                 if force:
                     if visLevels > 1:
                         self.SetFoldExpanded(line, True)
                     else:
                         self.SetFoldExpanded(line, False)
                 if force:
                     if visLevels > 1:
                         self.SetFoldExpanded(line, True)
                     else:
                         self.SetFoldExpanded(line, False)

+

                     line = self.Expand(line, doExpand, force, visLevels-1)
 
                 else:
                     line = self.Expand(line, doExpand, force, visLevels-1)
 
                 else:


@@ -315,10 +354,10 @@ def runTest(frame, nb, log):
     if not _USE_PANEL:
         ed = p = PythonSTC(nb, -1)
     else:
     if not _USE_PANEL:
         ed = p = PythonSTC(nb, -1)
     else:

-        p = wxPanel(nb, -1, style = wxNO_FULL_REPAINT_ON_RESIZE)
+        p = wx.Panel(nb, -1, style = wx.NO_FULL_REPAINT_ON_RESIZE)

         ed = PythonSTC(p, -1)
         ed = PythonSTC(p, -1)

-        s = wxBoxSizer(wxHORIZONTAL)
-        s.Add(ed, 1, wxEXPAND)
+        s = wx.BoxSizer(wx.HORIZONTAL)
+        s.Add(ed, 1, wx.EXPAND)

         p.SetSizer(s)
         p.SetAutoLayout(True)
 
         p.SetSizer(s)
         p.SetAutoLayout(True)
 


@@ -328,7 +367,7 @@ def runTest(frame, nb, log):
     ed.Colourise(0, -1)
 
     # line numbers in the margin
     ed.Colourise(0, -1)
 
     # line numbers in the margin

-    ed.SetMarginType(1, wxSTC_MARGIN_NUMBER)
+    ed.SetMarginType(1, stc.STC_MARGIN_NUMBER)

     ed.SetMarginWidth(1, 25)
 
     return p
     ed.SetMarginWidth(1, 25)
 
     return p