Minor tweaks and such to be saved prior to messing with the wxPython

build system...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@8501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-10-09 20:30:44 +00:00
parent fb1c66b394
commit 9fcc7e1447
47 changed files with 8328 additions and 4980 deletions

View File

@@ -6,7 +6,8 @@ from wxPython.lib.shell import PyShell
def runTest(frame, nb, log):
win = PyShell(nb)
testGlobals = {'hello' : 'How are you?'}
win = PyShell(nb, globals=testGlobals)
win.Show(true)
return win

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -13,6 +13,12 @@ class MyHtmlWindow(wxHtmlWindow):
def __init__(self, parent, id, log):
wxHtmlWindow.__init__(self, parent, id)
self.log = log
EVT_SCROLLWIN( self, self.OnScroll )
def OnScroll( self, event ):
print 'event.GetOrientation()',event.GetOrientation()
print 'event.GetPosition()',event.GetPosition()
event.Skip()
def OnLinkClicked(self, linkinfo):

View File

@@ -76,7 +76,7 @@ class TestListCtrlPanel(wxPanel):
wxToolTip_Enable(true)
self.list.InsertColumn(0, "Artist")
self.list.InsertColumn(1, "Title")
self.list.InsertColumn(1, "Title", wxLIST_FORMAT_RIGHT)
self.list.InsertColumn(2, "Genre")
items = musicdata.items()
for x in range(len(items)):
@@ -90,7 +90,10 @@ class TestListCtrlPanel(wxPanel):
self.list.SetColumnWidth(1, wxLIST_AUTOSIZE)
##self.list.SetColumnWidth(2, wxLIST_AUTOSIZE)
self.list.SetItemState(5, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED)
self.list.SetItemState(25, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED)
#self.list.SetItemState(25, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED)
#self.list.EnsureVisible(25)
# show how to change the colour of an item
item = self.list.GetItem(1)

View File

@@ -9,9 +9,17 @@ class MySplitter(wxSplitterWindow):
wxSplitterWindow.__init__(self, parent, ID)
self.log = log
EVT_SPLITTER_SASH_POS_CHANGED(self, self.GetId(), self.OnSashChanged)
EVT_SPLITTER_SASH_POS_CHANGING(self, self.GetId(), self.OnSashChanging)
def OnSashChanged(self, evt):
self.log.WriteText("sash changed to " + str(evt.GetSashPosition()))
self.log.WriteText("sash changed to %s\n" % str(evt.GetSashPosition()))
# uncomment this to not allow the change
#evt.SetSashPosition(-1)
def OnSashChanging(self, evt):
self.log.WriteText("sash changing to %s\n" % str(evt.GetSashPosition()))
# uncomment this to not allow the change
#evt.SetSashPosition(-1)
#---------------------------------------------------------------------------

View File

@@ -113,15 +113,15 @@ def runTest(frame, nb, log):
# now set some text to those styles... Normally this would be
# done in an event handler that happens when text needs displayed.
ed.StartStyling(98, 0xff)
ed.SetStyleFor(6, 1) # set style for 6 characters using style 1
ed.SetStyling(6, 1) # set style for 6 characters using style 1
ed.StartStyling(190, 0xff)
ed.SetStyleFor(20, 2)
ed.SetStyling(20, 2)
ed.StartStyling(310, 0xff)
ed.SetStyleFor(4, 3)
ed.SetStyleFor(2, 0)
ed.SetStyleFor(10, 4)
ed.SetStyling(4, 3)
ed.SetStyling(2, 0)
ed.SetStyling(10, 4)
# line numbers in the margin
@@ -146,16 +146,16 @@ def runTest(frame, nb, log):
# and finally, an indicator or two
ed.IndicatorSetStyle(0, wxSTC_INDIC_SQUIGGLE)
ed.IndicatorSetColour(0, wxRED)
ed.IndicatorSetForeground(0, wxRED)
ed.IndicatorSetStyle(1, wxSTC_INDIC_DIAGONAL)
ed.IndicatorSetColour(1, wxBLUE)
ed.IndicatorSetForeground(1, wxBLUE)
ed.IndicatorSetStyle(2, wxSTC_INDIC_STRIKE)
ed.IndicatorSetColour(2, wxRED)
ed.IndicatorSetForeground(2, wxRED)
ed.StartStyling(836, wxSTC_INDICS_MASK)
ed.SetStyleFor(10, wxSTC_INDIC0_MASK)
ed.SetStyleFor(10, wxSTC_INDIC1_MASK)
ed.SetStyleFor(10, wxSTC_INDIC2_MASK | wxSTC_INDIC1_MASK)
ed.SetStyling(10, wxSTC_INDIC0_MASK)
ed.SetStyling(10, wxSTC_INDIC1_MASK)
ed.SetStyling(10, wxSTC_INDIC2_MASK | wxSTC_INDIC1_MASK)
return ed

View File

@@ -41,13 +41,13 @@ class PythonSTC(wxStyledTextCtrl):
wxStyledTextCtrl.__init__(self, parent, ID)
self.SetLexer(wxSTC_LEX_PYTHON)
self.SetKeywords(0, string.join(keyword.kwlist))
self.SetKeyWords(0, string.join(keyword.kwlist))
self.SetProperty("fold", "1")
self.SetProperty("tab.timmy.whinge.level", "1")
self.SetMargins(0,0)
self.SetViewWhitespace(false)
self.SetViewWhiteSpace(false)
#self.SetBufferedDraw(false)
self.SetEdgeMode(wxSTC_EDGE_BACKGROUND)
@@ -82,33 +82,33 @@ class PythonSTC(wxStyledTextCtrl):
# Python styles
# White space
self.StyleSetSpec(SCE_P_DEFAULT, "fore:#808080")
self.StyleSetSpec(wxSTC_P_DEFAULT, "fore:#808080")
# Comment
self.StyleSetSpec(SCE_P_COMMENTLINE, "fore:#007F00,face:%(other)s" % faces)
self.StyleSetSpec(wxSTC_P_COMMENTLINE, "fore:#007F00,face:%(other)s" % faces)
# Number
self.StyleSetSpec(SCE_P_NUMBER, "fore:#007F7F")
self.StyleSetSpec(wxSTC_P_NUMBER, "fore:#007F7F")
# String
self.StyleSetSpec(SCE_P_STRING, "fore:#7F007F,italic,face:%(times)s" % faces)
self.StyleSetSpec(wxSTC_P_STRING, "fore:#7F007F,italic,face:%(times)s" % faces)
# Single quoted string
self.StyleSetSpec(SCE_P_CHARACTER, "fore:#7F007F,italic,face:%(times)s" % faces)
self.StyleSetSpec(wxSTC_P_CHARACTER, "fore:#7F007F,italic,face:%(times)s" % faces)
# Keyword
self.StyleSetSpec(SCE_P_WORD, "fore:#00007F,bold")
self.StyleSetSpec(wxSTC_P_WORD, "fore:#00007F,bold")
# Triple quotes
self.StyleSetSpec(SCE_P_TRIPLE, "fore:#7F0000")
self.StyleSetSpec(wxSTC_P_TRIPLE, "fore:#7F0000")
# Triple double quotes
self.StyleSetSpec(SCE_P_TRIPLEDOUBLE, "fore:#7F0000")
self.StyleSetSpec(wxSTC_P_TRIPLEDOUBLE, "fore:#7F0000")
# Class name definition
self.StyleSetSpec(SCE_P_CLASSNAME, "fore:#0000FF,bold,underline")
self.StyleSetSpec(wxSTC_P_CLASSNAME, "fore:#0000FF,bold,underline")
# Function or method name definition
self.StyleSetSpec(SCE_P_DEFNAME, "fore:#007F7F,bold")
self.StyleSetSpec(wxSTC_P_DEFNAME, "fore:#007F7F,bold")
# Operators
self.StyleSetSpec(SCE_P_OPERATOR, "bold")
self.StyleSetSpec(wxSTC_P_OPERATOR, "bold")
# Identifiers
#self.StyleSetSpec(SCE_P_IDENTIFIER, "bold")#,fore:#FF00FF")
#self.StyleSetSpec(wxSTC_P_IDENTIFIER, "bold")#,fore:#FF00FF")
# Comment-blocks
self.StyleSetSpec(SCE_P_COMMENTBLOCK, "fore:#7F7F7F")
self.StyleSetSpec(wxSTC_P_COMMENTBLOCK, "fore:#7F7F7F")
# End of line where string is not closed
self.StyleSetSpec(SCE_P_STRINGEOL, "fore:#000000,face:%(mono)s,back:#E0C0E0,eolfilled" % faces)
self.StyleSetSpec(wxSTC_P_STRINGEOL, "fore:#000000,face:%(mono)s,back:#E0C0E0,eolfilled" % faces)
self.SetCaretForeground("BLUE")
@@ -142,21 +142,21 @@ class PythonSTC(wxStyledTextCtrl):
styleBefore = self.GetStyleAt(caretPos - 1)
# check before
if charBefore and charBefore in "[]{}()" and ord(styleBefore) == SCE_P_OPERATOR:
if charBefore and chr(charBefore) in "[]{}()" and styleBefore == wxSTC_P_OPERATOR:
braceAtCaret = caretPos - 1
# check after
if braceAtCaret < 0:
charAfter = self.GetCharAt(caretPos)
styleAfter = self.GetStyleAt(caretPos)
if charAfter and charAfter in "[]{}()" and ord(styleAfter) == SCE_P_OPERATOR:
if charAfter and chr(charAfter) in "[]{}()" and styleAfter == wxSTC_P_OPERATOR:
braceAtCaret = caretPos
if braceAtCaret >= 0:
braceOpposite = self.BraceMatch(braceAtCaret)
if braceAtCaret != -1 and braceOpposite == -1:
self.BraceBadlight(braceAtCaret)
self.BraceBadLight(braceAtCaret)
else:
self.BraceHighlight(braceAtCaret, braceOpposite)
#pt = self.PointFromPosition(braceOpposite)
@@ -171,7 +171,7 @@ class PythonSTC(wxStyledTextCtrl):
if evt.GetShift() and evt.GetControl():
self.FoldAll()
else:
lineClicked = self.GetLineFromPos(evt.GetPosition())
lineClicked = self.LineFromPosition(evt.GetPosition())
if self.GetFoldLevel(lineClicked) & wxSTC_FOLDLEVELHEADERFLAG:
if evt.GetShift():
self.SetFoldExpanded(lineClicked, true)

View File

@@ -20,7 +20,8 @@ class TestPanel(wxPanel):
EVT_TEXT(self, 20, self.EvtText)
wxStaticText(self, -1, "Multi-line", wxPoint(5, 75), wxSize(75, 20))
t = wxTextCtrl(self, 30, "How does it work with a long line of text set in the control", wxPoint(80, 75), wxSize(200, 150), wxTE_MULTILINE)
t = wxTextCtrl(self, 30, "How does it work with a long line of text set in the control",
wxPoint(80, 75), wxSize(200, 150), wxTE_MULTILINE)
t.SetInsertionPoint(0)
EVT_TEXT(self, 30, self.EvtText)

View File

@@ -51,8 +51,10 @@ class TestToolBar(wxFrame):
tb.AddSeparator()
tb.AddControl(wxComboBox(tb, -1, "", choices=["", "This", "is a", "wxComboBox"],
cbID = wxNewId()
tb.AddControl(wxComboBox(tb, cbID, "", choices=["", "This", "is a", "wxComboBox"],
size=(150,-1), style=wxCB_DROPDOWN))
EVT_COMBOBOX(self, cbID, self.OnCombo)
tb.Realize()
EVT_CLOSE(self, self.OnCloseWindow)
@@ -67,6 +69,10 @@ class TestToolBar(wxFrame):
def OnToolRClick(self, event):
self.log.WriteText("tool %s right-clicked\n" % event.GetId())
def OnCombo(self, event):
self.log.WriteText("combobox item selected: %s\n" % event.GetString())
#---------------------------------------------------------------------------
def runTest(frame, nb, log):