projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added a few encoding convenience methods for pc-mac encoding and string handling...
[wxWidgets.git]
/
wxPython
/
demo
/
wxStyledTextCtrl_2.py
diff --git
a/wxPython/demo/wxStyledTextCtrl_2.py
b/wxPython/demo/wxStyledTextCtrl_2.py
index 8eac0b58509b43355df4c5e1274e71968fca6e4a..a6f80f6623bb006af3feefe039ee458139ba9b8f 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' : 1
1
,
- 'size2':
9
,
+ 'size' : 1
3
,
+ 'size2':
11
,
}
}
@@
-40,6
+40,9
@@
class PythonSTC(wxStyledTextCtrl):
def __init__(self, parent, ID):
wxStyledTextCtrl.__init__(self, parent, ID)
def __init__(self, parent, ID):
wxStyledTextCtrl.__init__(self, parent, ID)
+ 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.SetLexer(wxSTC_LEX_PYTHON)
self.SetKeyWords(0, string.join(keyword.kwlist))
@@
-82,33
+85,33
@@
class PythonSTC(wxStyledTextCtrl):
# Python styles
# White space
# Python styles
# White space
- self.StyleSetSpec(wxSTC_P_DEFAULT, "fore:#808080
"
)
+ self.StyleSetSpec(wxSTC_P_DEFAULT, "fore:#808080
,face:%(helv)s,size:%(size)d" % faces
)
# Comment
# Comment
- self.StyleSetSpec(wxSTC_P_COMMENTLINE, "fore:#007F00,face:%(other)s" % faces)
+ self.StyleSetSpec(wxSTC_P_COMMENTLINE, "fore:#007F00,face:%(other)s
,size:%(size)d
" % faces)
# Number
# Number
- self.StyleSetSpec(wxSTC_P_NUMBER, "fore:#007F7F
"
)
+ self.StyleSetSpec(wxSTC_P_NUMBER, "fore:#007F7F
,size:%(size)d" % faces
)
# String
# String
- self.StyleSetSpec(wxSTC_P_STRING, "fore:#7F007F,italic,face:%(times)s" % faces)
+ self.StyleSetSpec(wxSTC_P_STRING, "fore:#7F007F,italic,face:%(times)s
,size:%(size)d
" % faces)
# Single quoted string
# Single quoted string
- self.StyleSetSpec(wxSTC_P_CHARACTER, "fore:#7F007F,italic,face:%(times)s" % faces)
+ self.StyleSetSpec(wxSTC_P_CHARACTER, "fore:#7F007F,italic,face:%(times)s
,size:%(size)d
" % faces)
# Keyword
# Keyword
- self.StyleSetSpec(wxSTC_P_WORD, "fore:#00007F,bold
"
)
+ self.StyleSetSpec(wxSTC_P_WORD, "fore:#00007F,bold
,size:%(size)d" % faces
)
# Triple quotes
# Triple quotes
- self.StyleSetSpec(wxSTC_P_TRIPLE, "fore:#7F0000
"
)
+ self.StyleSetSpec(wxSTC_P_TRIPLE, "fore:#7F0000
,size:%(size)d" % faces
)
# Triple double quotes
# Triple double quotes
- self.StyleSetSpec(wxSTC_P_TRIPLEDOUBLE, "fore:#7F0000
"
)
+ self.StyleSetSpec(wxSTC_P_TRIPLEDOUBLE, "fore:#7F0000
,size:%(size)d" % faces
)
# Class name definition
# Class name definition
- self.StyleSetSpec(wxSTC_P_CLASSNAME, "fore:#0000FF,bold,underline
"
)
+ self.StyleSetSpec(wxSTC_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
"
)
+ self.StyleSetSpec(wxSTC_P_DEFNAME, "fore:#007F7F,bold
,size:%(size)d" % faces
)
# Operators
# Operators
- self.StyleSetSpec(wxSTC_P_OPERATOR, "bold
"
)
+ self.StyleSetSpec(wxSTC_P_OPERATOR, "bold
,size:%(size)d" % faces
)
# Identifiers
# Identifiers
-
#self.StyleSetSpec(wxSTC_P_IDENTIFIER, "bold")#,fore:#FF00FF"
)
+
self.StyleSetSpec(wxSTC_P_IDENTIFIER, "fore:#808080,face:%(helv)s,size:%(size)d" % faces
)
# Comment-blocks
# Comment-blocks
- self.StyleSetSpec(wxSTC_P_COMMENTBLOCK, "fore:#7F7F7F
"
)
+ self.StyleSetSpec(wxSTC_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,eolfilled" % faces)
+ self.StyleSetSpec(wxSTC_P_STRINGEOL, "fore:#000000,face:%(mono)s,back:#E0C0E0,eolfilled
,size:%(size)d
" % faces)
self.SetCaretForeground("BLUE")
self.SetCaretForeground("BLUE")
@@
-262,8
+265,19
@@
class PythonSTC(wxStyledTextCtrl):
#----------------------------------------------------------------------
#----------------------------------------------------------------------
+_USE_PANEL = 1
+
def runTest(frame, nb, log):
def runTest(frame, nb, log):
- ed = PythonSTC(nb, -1)
+ if not _USE_PANEL:
+ ed = p = PythonSTC(nb, -1)
+ else:
+ p = wxPanel(nb, -1)
+ ed = PythonSTC(p, -1)
+ s = wxBoxSizer(wxHORIZONTAL)
+ s.Add(ed, 1, wxEXPAND)
+ p.SetSizer(s)
+ p.SetAutoLayout(true)
+
ed.SetText(demoText + open('Main.py').read())
ed.EmptyUndoBuffer()
ed.SetText(demoText + open('Main.py').read())
ed.EmptyUndoBuffer()
@@
-273,7
+287,7
@@
def runTest(frame, nb, log):
ed.SetMarginType(1, wxSTC_MARGIN_NUMBER)
ed.SetMarginWidth(1, 25)
ed.SetMarginType(1, wxSTC_MARGIN_NUMBER)
ed.SetMarginWidth(1, 25)
- return
ed
+ return
p