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

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

View File

@@ -7,16 +7,18 @@ import images
class TestToolBar(wxFrame):
def __init__(self, parent, log):
wxFrame.__init__(self, parent, -1, 'Test ToolBar',
wxPoint(0,0), wxSize(500, 300))
wxFrame.__init__(self, parent, -1, 'Test ToolBar', size=(500, 300))
self.log = log
self.timer = None
EVT_CLOSE(self, self.OnCloseWindow)
wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER|wxTB_FLAT)
# wxTB_VERTICAL
tb = self.CreateToolBar( wxTB_HORIZONTAL
| wxNO_BORDER
| wxTB_FLAT
| wxTB_TEXT
)
#tb = wxToolBarSimple(self, -1, wxDefaultPosition, wxDefaultSize,
# wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT)
#self.SetToolBar(tb)
@@ -24,6 +26,7 @@ class TestToolBar(wxFrame):
self.CreateStatusBar()
tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'")
#tb.AddLabelTool(10, "New", images.getNewBitmap(), shortHelp="New", longHelp="Long help for 'New'")
EVT_TOOL(self, 10, self.OnToolClick)
EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)
@@ -46,9 +49,9 @@ class TestToolBar(wxFrame):
shortHelp="Toggle this")
EVT_TOOL(self, 50, self.OnToolClick)
#tb.AddCheckTool(60, '', images.getTog1Bitmap(), images.getTog2Bitmap(),
# shortHelp="Toggle with 2 bitmaps")
#EVT_TOOL(self, 60, self.OnToolClick)
## tb.AddCheckTool(60, images.getTog1Bitmap(), images.getTog2Bitmap(),
## shortHelp="Toggle with 2 bitmaps")
## EVT_TOOL(self, 60, self.OnToolClick)
EVT_TOOL_ENTER(self, -1, self.OnToolEnter)
EVT_TOOL_RCLICKED(self, -1, self.OnToolRClick) # Match all
@@ -100,7 +103,7 @@ class TestToolBar(wxFrame):
def runTest(frame, nb, log):
win = TestToolBar(frame, log)
frame.otherWin = win
win.Show(true)
win.Show(True)
#---------------------------------------------------------------------------
@@ -109,16 +112,15 @@ def runTest(frame, nb, log):
overview = """\
"""
if __name__ == '__main__':
import sys,os
import run
run.main(['', os.path.basename(sys.argv[0])])