Removed deprecation warnings in OGL and Gizmos

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

diff --git a/wxPython/demo/wxStyledTextCtrl_2.py b/wxPython/demo/wxStyledTextCtrl_2.py
index ee705e4c2632136eaa42517f0872224247009928..516383f50fe09ef834270612dfb85f4566590920 100644 (file)
--- a/wxPython/demo/wxStyledTextCtrl_2.py
+++ b/wxPython/demo/wxStyledTextCtrl_2.py
@@ -29,8 +29,8 @@ else:
               'mono' : 'Courier',
               'helv' : 'Helvetica',
               'other': 'new century schoolbook',
               'mono' : 'Courier',
               'helv' : 'Helvetica',
               'other': 'new century schoolbook',

-              'size' : 13,
-              'size2': 11,
+              'size' : 12,
+              'size2': 10,

              }
 
 
              }
 
 


@@ -38,20 +38,21 @@ else:
 
 class PythonSTC(wxStyledTextCtrl):
     def __init__(self, parent, ID):
 
 class PythonSTC(wxStyledTextCtrl):
     def __init__(self, parent, ID):

-        wxStyledTextCtrl.__init__(self, parent, ID)
+        wxStyledTextCtrl.__init__(self, parent, ID,
+                                  style = wxNO_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.SetLexer(wxSTC_LEX_PYTHON)
 
         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.SetKeyWords(0, string.join(keyword.kwlist))
+        self.SetKeyWords(0, " ".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.SetBufferedDraw(false)
+        self.SetViewWhiteSpace(False)
+        #self.SetBufferedDraw(False)

 
         self.SetEdgeMode(wxSTC_EDGE_BACKGROUND)
         self.SetEdgeColumn(78)
 
         self.SetEdgeMode(wxSTC_EDGE_BACKGROUND)
         self.SetEdgeColumn(78)


@@ -60,7 +61,7 @@ class PythonSTC(wxStyledTextCtrl):
         #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.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.SetMarginSensitive(2, true)
+        self.SetMarginSensitive(2, True)

         self.SetMarginWidth(2, 12)
 
         if 0: # simple folder marks, like the old version
         self.SetMarginWidth(2, 12)
 
         if 0: # simple folder marks, like the old version


@@ -150,7 +151,7 @@ class PythonSTC(wxStyledTextCtrl):
                 #lst = []
                 #for x in range(50000):
                 #    lst.append('%05d' % x)
                 #lst = []
                 #for x in range(50000):
                 #    lst.append('%05d' % x)

-                #st = string.join(lst)
+                #st = " ".join(lst)

                 #print len(st)
                 #self.AutoCompShow(0, st)
 
                 #print len(st)
                 #self.AutoCompShow(0, st)
 


@@ -164,9 +165,9 @@ class PythonSTC(wxStyledTextCtrl):
                 kw.append("this_is_a_much_much_much_much_much_much_much_longer_value")
 
                 kw.sort()  # Python sorts are case sensitive
                 kw.append("this_is_a_much_much_much_much_much_much_much_longer_value")
 
                 kw.sort()  # Python sorts are case sensitive

-                self.AutoCompSetIgnoreCase(false)  # so this needs to match
+                self.AutoCompSetIgnoreCase(False)  # so this needs to match

 
 

-                self.AutoCompShow(0, string.join(kw))
+                self.AutoCompShow(0, " ".join(kw))

         else:
             event.Skip()
 
         else:
             event.Skip()
 


@@ -174,7 +175,7 @@ class PythonSTC(wxStyledTextCtrl):
     def OnUpdateUI(self, evt):
         # check for matching braces
         braceAtCaret = -1
     def OnUpdateUI(self, evt):
         # check for matching braces
         braceAtCaret = -1

-       braceOpposite = -1
+        braceOpposite = -1

         charBefore = None
         caretPos = self.GetCurrentPos()
         if caretPos > 0:
         charBefore = None
         caretPos = self.GetCurrentPos()
         if caretPos > 0:


@@ -200,9 +201,9 @@ class PythonSTC(wxStyledTextCtrl):
         else:
             self.BraceHighlight(braceAtCaret, braceOpposite)
             #pt = self.PointFromPosition(braceOpposite)
         else:
             self.BraceHighlight(braceAtCaret, braceOpposite)
             #pt = self.PointFromPosition(braceOpposite)

-            #self.Refresh(true, wxRect(pt.x, pt.y, 5,5))
+            #self.Refresh(True, wxRect(pt.x, pt.y, 5,5))

             #print pt
             #print pt

-            #self.Refresh(false)
+            #self.Refresh(False)

 
 
     def OnMarginClick(self, evt):
 
 
     def OnMarginClick(self, evt):


@@ -214,22 +215,22 @@ class PythonSTC(wxStyledTextCtrl):
                 lineClicked = self.LineFromPosition(evt.GetPosition())
                 if self.GetFoldLevel(lineClicked) & wxSTC_FOLDLEVELHEADERFLAG:
                     if evt.GetShift():
                 lineClicked = self.LineFromPosition(evt.GetPosition())
                 if self.GetFoldLevel(lineClicked) & wxSTC_FOLDLEVELHEADERFLAG:
                     if evt.GetShift():

-                        self.SetFoldExpanded(lineClicked, true)
-                        self.Expand(lineClicked, true, true, 1)
+                        self.SetFoldExpanded(lineClicked, True)
+                        self.Expand(lineClicked, True, True, 1)

                     elif evt.GetControl():
                         if self.GetFoldExpanded(lineClicked):
                     elif evt.GetControl():
                         if self.GetFoldExpanded(lineClicked):

-                            self.SetFoldExpanded(lineClicked, false)
-                            self.Expand(lineClicked, false, true, 0)
+                            self.SetFoldExpanded(lineClicked, False)
+                            self.Expand(lineClicked, False, True, 0)

                         else:
                         else:

-                            self.SetFoldExpanded(lineClicked, true)
-                            self.Expand(lineClicked, true, true, 100)
+                            self.SetFoldExpanded(lineClicked, True)
+                            self.Expand(lineClicked, True, True, 100)

                     else:
                         self.ToggleFold(lineClicked)
 
 
     def FoldAll(self):
         lineCount = self.GetLineCount()
                     else:
                         self.ToggleFold(lineClicked)
 
 
     def FoldAll(self):
         lineCount = self.GetLineCount()

-        expanding = true
+        expanding = True

 
         # 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):


@@ -244,12 +245,12 @@ class PythonSTC(wxStyledTextCtrl):
                (level & wxSTC_FOLDLEVELNUMBERMASK) == wxSTC_FOLDLEVELBASE:
 
                 if expanding:
                (level & wxSTC_FOLDLEVELNUMBERMASK) == wxSTC_FOLDLEVELBASE:
 
                 if expanding:

-                    self.SetFoldExpanded(lineNum, true)
-                    lineNum = self.Expand(lineNum, true)
+                    self.SetFoldExpanded(lineNum, True)
+                    lineNum = self.Expand(lineNum, True)

                     lineNum = lineNum - 1
                 else:
                     lastChild = self.GetLastChild(lineNum, -1)
                     lineNum = lineNum - 1
                 else:
                     lastChild = self.GetLastChild(lineNum, -1)

-                    self.SetFoldExpanded(lineNum, false)
+                    self.SetFoldExpanded(lineNum, False)

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


@@ -257,9 +258,9 @@ class PythonSTC(wxStyledTextCtrl):
 
 
 
 
 
 

-    def Expand(self, line, doExpand, force=false, visLevels=0, level=-1):
+    def Expand(self, line, doExpand, force=False, visLevels=0, level=-1):

         lastChild = self.GetLastChild(line, level)
         lastChild = self.GetLastChild(line, level)

-       line = line + 1
+        line = line + 1

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


@@ -276,16 +277,16 @@ class PythonSTC(wxStyledTextCtrl):
             if level & wxSTC_FOLDLEVELHEADERFLAG:
                 if force:
                     if visLevels > 1:
             if level & wxSTC_FOLDLEVELHEADERFLAG:
                 if force:
                     if visLevels > 1:

-                        self.SetFoldExpanded(line, true)
+                        self.SetFoldExpanded(line, True)

                     else:
                     else:

-                        self.SetFoldExpanded(line, false)
+                        self.SetFoldExpanded(line, False)

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

-                        line = self.Expand(line, true, force, visLevels-1)
+                        line = self.Expand(line, True, force, visLevels-1)

                     else:
                     else:

-                        line = self.Expand(line, false, force, visLevels-1)
+                        line = self.Expand(line, False, force, visLevels-1)

             else:
                 line = line + 1;
 
             else:
                 line = line + 1;
 


@@ -300,12 +301,12 @@ 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)
+        p = wxPanel(nb, -1, style = wxNO_FULL_REPAINT_ON_RESIZE)

         ed = PythonSTC(p, -1)
         s = wxBoxSizer(wxHORIZONTAL)
         s.Add(ed, 1, wxEXPAND)
         p.SetSizer(s)
         ed = PythonSTC(p, -1)
         s = wxBoxSizer(wxHORIZONTAL)
         s.Add(ed, 1, wxEXPAND)
         p.SetSizer(s)

-        p.SetAutoLayout(true)
+        p.SetAutoLayout(True)

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


@@ -333,9 +334,9 @@ be helpful.
 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':

-    import os
+    import sys,os

     import run
     import run

-    run.main(['', os.path.basename(__file__)])
+    run.main(['', os.path.basename(sys.argv[0])])