projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
forgot to commit some regenerated files
[wxWidgets.git]
/
wxPython
/
demo
/
wxStyledTextCtrl_2.py
diff --git
a/wxPython/demo/wxStyledTextCtrl_2.py
b/wxPython/demo/wxStyledTextCtrl_2.py
index c5dfd8af7a8f0df89a05694f0556335df1f5a226..81de04da756fd548a86e34eb3e8937c1a1adfe67 100644
(file)
--- a/
wxPython/demo/wxStyledTextCtrl_2.py
+++ b/
wxPython/demo/wxStyledTextCtrl_2.py
@@
-1,7
+1,7
@@
from wxPython.wx import *
from wxPython.stc import *
from wxPython.wx import *
from wxPython.stc import *
-
+import images
import keyword
#----------------------------------------------------------------------
import keyword
#----------------------------------------------------------------------
@@
-29,8
+29,8
@@
else:
'mono' : 'Courier',
'helv' : 'Helvetica',
'other': 'new century schoolbook',
'mono' : 'Courier',
'helv' : 'Helvetica',
'other': 'new century schoolbook',
- 'size' : 1
3
,
- 'size2': 1
1
,
+ 'size' : 1
2
,
+ 'size2': 1
0
,
}
}
@@
-38,20
+38,22
@@
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.SetViewEOL(True)
self.SetEdgeMode(wxSTC_EDGE_BACKGROUND)
self.SetEdgeColumn(78)
self.SetEdgeMode(wxSTC_EDGE_BACKGROUND)
self.SetEdgeColumn(78)
@@
-60,7
+62,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,
t
rue)
+ self.SetMarginSensitive(2,
T
rue)
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
@@
-84,6
+86,7
@@
class PythonSTC(wxStyledTextCtrl):
EVT_STC_UPDATEUI(self, ID, self.OnUpdateUI)
EVT_STC_MARGINCLICK(self, ID, self.OnMarginClick)
EVT_STC_UPDATEUI(self, ID, self.OnUpdateUI)
EVT_STC_MARGINCLICK(self, ID, self.OnMarginClick)
+ EVT_KEY_DOWN(self, self.OnKeyPressed)
# Make some styles, The lexer defines what each style is used for, we
# Make some styles, The lexer defines what each style is used for, we
@@
-107,9
+110,9
@@
class PythonSTC(wxStyledTextCtrl):
# Number
self.StyleSetSpec(wxSTC_P_NUMBER, "fore:#007F7F,size:%(size)d" % faces)
# String
# Number
self.StyleSetSpec(wxSTC_P_NUMBER, "fore:#007F7F,size:%(size)d" % faces)
# String
- self.StyleSetSpec(wxSTC_P_STRING, "fore:#7F007F,
italic,face:%(times
)s,size:%(size)d" % faces)
+ self.StyleSetSpec(wxSTC_P_STRING, "fore:#7F007F,
face:%(helv
)s,size:%(size)d" % faces)
# Single quoted string
# Single quoted string
- self.StyleSetSpec(wxSTC_P_CHARACTER, "fore:#7F007F,
italic,face:%(times
)s,size:%(size)d" % faces)
+ self.StyleSetSpec(wxSTC_P_CHARACTER, "fore:#7F007F,
face:%(helv
)s,size:%(size)d" % faces)
# Keyword
self.StyleSetSpec(wxSTC_P_WORD, "fore:#00007F,bold,size:%(size)d" % faces)
# Triple quotes
# Keyword
self.StyleSetSpec(wxSTC_P_WORD, "fore:#00007F,bold,size:%(size)d" % faces)
# Triple quotes
@@
-129,42
+132,56
@@
class PythonSTC(wxStyledTextCtrl):
# 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)
# 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.SetCaretForeground("BLUE")
self.SetCaretForeground("BLUE")
- EVT_KEY_DOWN(self, self.OnKeyPressed)
+
+ # register some images for use in the AutoComplete box.
+ self.RegisterImage(1, images.getSmilesBitmap())
+ self.RegisterImage(2, images.getFile1Bitmap())
+ self.RegisterImage(3, images.getCopy2Bitmap())
+
+
def OnKeyPressed(self, event):
def OnKeyPressed(self, event):
+ if self.CallTipActive():
+ self.CallTipCancel()
key = event.KeyCode()
if key == 32 and event.ControlDown():
pos = self.GetCurrentPos()
# Tips
if event.ShiftDown():
self.CallTipSetBackground("yellow")
key = event.KeyCode()
if key == 32 and event.ControlDown():
pos = self.GetCurrentPos()
# Tips
if event.ShiftDown():
self.CallTipSetBackground("yellow")
- self.CallTipShow(pos, 'param1, param2')
+ self.CallTipShow(pos, 'lots of of text: blah, blah, blah\n\n'
+ 'show some suff, maybe parameters..\n\n'
+ 'fubar(param1, param2)')
# Code completion
else:
#lst = []
#for x in range(50000):
# lst.append('%05d' % x)
# Code completion
else:
#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 = keyword.kwlist[:]
#print len(st)
#self.AutoCompShow(0, st)
kw = keyword.kwlist[:]
- kw.append("zzzzzz")
- kw.append("aaaaa")
- kw.append("__init__")
- kw.append("zzaaaaa")
- kw.append("zzbaaaa")
+ kw.append("zzzzzz
?2
")
+ kw.append("aaaaa
?2
")
+ kw.append("__init__
?3
")
+ kw.append("zzaaaaa
?2
")
+ kw.append("zzbaaaa
?2
")
kw.append("this_is_a_longer_value")
kw.append("this_is_a_longer_value")
- kw.append("this_is_a_much_much_much_much_much_much_much_longer_value")
+
#
kw.append("this_is_a_much_much_much_much_much_much_much_longer_value")
kw.sort() # Python sorts are case sensitive
kw.sort() # Python sorts are case sensitive
- self.AutoCompSetIgnoreCase(
f
alse) # so this needs to match
+ self.AutoCompSetIgnoreCase(
F
alse) # so this needs to match
- self.AutoCompShow(0, string.join(kw))
+ # Images are specified with a appended "?type"
+ for i in range(len(kw)):
+ if kw[i] in keyword.kwlist:
+ kw[i] = kw[i] + "?1"
+
+ self.AutoCompShow(0, " ".join(kw))
else:
event.Skip()
else:
event.Skip()
@@
-172,7
+189,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:
@@
-198,9
+215,9
@@
class PythonSTC(wxStyledTextCtrl):
else:
self.BraceHighlight(braceAtCaret, braceOpposite)
#pt = self.PointFromPosition(braceOpposite)
else:
self.BraceHighlight(braceAtCaret, braceOpposite)
#pt = self.PointFromPosition(braceOpposite)
- #self.Refresh(
t
rue, wxRect(pt.x, pt.y, 5,5))
+ #self.Refresh(
T
rue, wxRect(pt.x, pt.y, 5,5))
#print pt
#print pt
- #self.Refresh(
f
alse)
+ #self.Refresh(
F
alse)
def OnMarginClick(self, evt):
def OnMarginClick(self, evt):
@@
-212,22
+229,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,
t
rue)
- self.Expand(lineClicked,
true, t
rue, 1)
+ self.SetFoldExpanded(lineClicked,
T
rue)
+ self.Expand(lineClicked,
True, T
rue, 1)
elif evt.GetControl():
if self.GetFoldExpanded(lineClicked):
elif evt.GetControl():
if self.GetFoldExpanded(lineClicked):
- self.SetFoldExpanded(lineClicked,
f
alse)
- self.Expand(lineClicked,
false, t
rue, 0)
+ self.SetFoldExpanded(lineClicked,
F
alse)
+ self.Expand(lineClicked,
False, T
rue, 0)
else:
else:
- self.SetFoldExpanded(lineClicked,
t
rue)
- self.Expand(lineClicked,
true, t
rue, 100)
+ self.SetFoldExpanded(lineClicked,
T
rue)
+ self.Expand(lineClicked,
True, T
rue, 100)
else:
self.ToggleFold(lineClicked)
def FoldAll(self):
lineCount = self.GetLineCount()
else:
self.ToggleFold(lineClicked)
def FoldAll(self):
lineCount = self.GetLineCount()
- expanding =
t
rue
+ expanding =
T
rue
# 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):
@@
-242,12
+259,12
@@
class PythonSTC(wxStyledTextCtrl):
(level & wxSTC_FOLDLEVELNUMBERMASK) == wxSTC_FOLDLEVELBASE:
if expanding:
(level & wxSTC_FOLDLEVELNUMBERMASK) == wxSTC_FOLDLEVELBASE:
if expanding:
- self.SetFoldExpanded(lineNum,
t
rue)
- lineNum = self.Expand(lineNum,
t
rue)
+ self.SetFoldExpanded(lineNum,
T
rue)
+ lineNum = self.Expand(lineNum,
T
rue)
lineNum = lineNum - 1
else:
lastChild = self.GetLastChild(lineNum, -1)
lineNum = lineNum - 1
else:
lastChild = self.GetLastChild(lineNum, -1)
- self.SetFoldExpanded(lineNum,
f
alse)
+ self.SetFoldExpanded(lineNum,
F
alse)
if lastChild > lineNum:
self.HideLines(lineNum+1, lastChild)
if lastChild > lineNum:
self.HideLines(lineNum+1, lastChild)
@@
-255,9
+272,9
@@
class PythonSTC(wxStyledTextCtrl):
- def Expand(self, line, doExpand, force=
f
alse, visLevels=0, level=-1):
+ def Expand(self, line, doExpand, force=
F
alse, 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:
@@
-274,16
+291,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,
t
rue)
+ self.SetFoldExpanded(line,
T
rue)
else:
else:
- self.SetFoldExpanded(line,
f
alse)
+ self.SetFoldExpanded(line,
F
alse)
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,
t
rue, force, visLevels-1)
+ line = self.Expand(line,
T
rue, force, visLevels-1)
else:
else:
- line = self.Expand(line,
f
alse, force, visLevels-1)
+ line = self.Expand(line,
F
alse, force, visLevels-1)
else:
line = line + 1;
else:
line = line + 1;
@@
-298,12
+315,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(
t
rue)
+ p.SetAutoLayout(
T
rue)
ed.SetText(demoText + open('Main.py').read())
ed.SetText(demoText + open('Main.py').read())
@@
-331,13
+348,9
@@
be helpful.
if __name__ == '__main__':
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