Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged wxPython 2.4.x to the 2.5 branch (Finally!!!)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-03-25 06:35:27 +00:00
parent 9b4e3f352b
commit 1e4a197e4c
586 changed files with 62691 additions and 17740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
wxPython/demo/wxStyledTextCtrl_2.py
View File

@@ -45,14 +45,14 @@ class PythonSTC(wxStyledTextCtrl):
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.SetViewWhiteSpace(false)
#self.SetBufferedDraw(false)
self.SetViewWhiteSpace(False)
#self.SetBufferedDraw(False)
self.SetEdgeMode(wxSTC_EDGE_BACKGROUND)
self.SetEdgeColumn(78)
@@ -61,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.SetMarginSensitive(2, true)
self.SetMarginSensitive(2, True)
self.SetMarginWidth(2, 12)
if 0: # simple folder marks, like the old version
@@ -151,7 +151,7 @@ class PythonSTC(wxStyledTextCtrl):
#lst = []
#for x in range(50000):
# lst.append('%05d' % x)
#st = string.join(lst)
#st = " ".join(lst)
#print len(st)
#self.AutoCompShow(0, st)
@@ -165,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
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()
@@ -175,7 +175,7 @@ class PythonSTC(wxStyledTextCtrl):
def OnUpdateUI(self, evt):
# check for matching braces
braceAtCaret = -1
braceOpposite = -1
braceOpposite = -1
charBefore = None
caretPos = self.GetCurrentPos()
if caretPos > 0:
@@ -201,9 +201,9 @@ class PythonSTC(wxStyledTextCtrl):
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
#self.Refresh(false)
#self.Refresh(False)
def OnMarginClick(self, evt):
@@ -215,22 +215,22 @@ class PythonSTC(wxStyledTextCtrl):
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):
self.SetFoldExpanded(lineClicked, false)
self.Expand(lineClicked, false, true, 0)
self.SetFoldExpanded(lineClicked, False)
self.Expand(lineClicked, False, True, 0)
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()
expanding = true
expanding = True
# find out if we are folding or unfolding
for lineNum in range(lineCount):
@@ -245,12 +245,12 @@ class PythonSTC(wxStyledTextCtrl):
(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)
self.SetFoldExpanded(lineNum, false)
self.SetFoldExpanded(lineNum, False)
if lastChild > lineNum:
self.HideLines(lineNum+1, lastChild)
@@ -258,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)
line = line + 1
line = line + 1
while line <= lastChild:
if force:
if visLevels > 0:
@@ -277,16 +277,16 @@ class PythonSTC(wxStyledTextCtrl):
if level & wxSTC_FOLDLEVELHEADERFLAG:
if force:
if visLevels > 1:
self.SetFoldExpanded(line, true)
self.SetFoldExpanded(line, True)
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, true, force, visLevels-1)
line = self.Expand(line, True, force, visLevels-1)
else:
line = self.Expand(line, false, force, visLevels-1)
line = self.Expand(line, False, force, visLevels-1)
else:
line = line + 1;
@@ -306,7 +306,7 @@ def runTest(frame, nb, log):
s = wxBoxSizer(wxHORIZONTAL)
s.Add(ed, 1, wxEXPAND)
p.SetSizer(s)
p.SetAutoLayout(true)
p.SetAutoLayout(True)
ed.SetText(demoText + open('Main.py').read())