'mono' : 'Courier',
'helv' : 'Helvetica',
'other': 'new century schoolbook',
- 'size' : 13,
- 'size2': 11,
+ 'size' : 12,
+ 'size2': 10,
}
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.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)
#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.SetMarginWidth(2, 15)
- self.MarkerDefine(wxSTC_MARKNUM_FOLDER, wxSTC_MARK_ARROW, "navy", "navy")
- self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_ARROWDOWN, "navy", "navy")
+ 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)
# Comment-blocks
self.StyleSetSpec(wxSTC_P_COMMENTBLOCK, "fore:#7F7F7F,size:%(size)d" % faces)
# End of line where string is not closed
- self.StyleSetSpec(wxSTC_P_STRINGEOL, "fore:#000000,face:%(mono)s,back:#E0C0E0,eolfilled,size:%(size)d" % faces)
+ self.StyleSetSpec(wxSTC_P_STRINGEOL, "fore:#000000,face:%(mono)s,back:#E0C0E0,eol,size:%(size)d" % faces)
self.SetCaretForeground("BLUE")
def OnKeyPressed(self, event):
+ if self.CallTipActive():
+ self.CallTipCancel()
key = event.KeyCode()
if key == 32 and event.ControlDown():
pos = self.GetCurrentPos()
#lst = []
#for x in range(50000):
# lst.append('%05d' % x)
- #st = string.join(lst)
+ #st = " ".join(lst)
#print len(st)
#self.AutoCompShow(0, st)
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()
def OnUpdateUI(self, evt):
# check for matching braces
braceAtCaret = -1
- braceOpposite = -1
+ braceOpposite = -1
charBefore = None
caretPos = self.GetCurrentPos()
if caretPos > 0:
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):
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):
(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)
- 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:
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;
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)
- p.SetAutoLayout(true)
+ p.SetAutoLayout(True)
ed.SetText(demoText + open('Main.py').read())
if __name__ == '__main__':
- import sys
- app = wxPySimpleApp()
- frame = wxFrame(None, -1, "Tester...", size=(640, 480))
- win = runTest(frame, frame, sys.stdout)
- frame.Show(true)
- app.MainLoop()
-
+ import sys,os
+ import run
+ run.main(['', os.path.basename(sys.argv[0])])
projects / wxWidgets.git / blobdiff