Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates for new wxToolBar API

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-03-27 01:10:28 +00:00
parent be86ffe39e
commit c12de7f83a
8 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wxPython/demo/wxFloatBar.py
View File

@@ -21,28 +21,27 @@ class TestFloatBar(wxFrame):
tb.SetTitle("Floating!")
self.CreateStatusBar()
tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'")
tb.AddSimpleTool(10, '', images.getNewBitmap(), "New", "Long help for 'New'")
EVT_TOOL(self, 10, self.OnToolClick)
EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)
tb.AddSimpleTool(20, images.getOpenBitmap(), "Open")
tb.AddSimpleTool(20, '', images.getOpenBitmap(), "Open")
EVT_TOOL(self, 20, self.OnToolClick)
EVT_TOOL_RCLICKED(self, 20, self.OnToolRClick)
tb.AddSeparator()
tb.AddSimpleTool(30, images.getCopyBitmap(), "Copy")
tb.AddSimpleTool(30, '', images.getCopyBitmap(), "Copy")
EVT_TOOL(self, 30, self.OnToolClick)
EVT_TOOL_RCLICKED(self, 30, self.OnToolRClick)
tb.AddSimpleTool(40, images.getPasteBitmap(), "Paste")
tb.AddSimpleTool(40, '', images.getPasteBitmap(), "Paste")
EVT_TOOL(self, 40, self.OnToolClick)
EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick)
tb.AddSeparator()
tb.AddTool(60, images.getTog1Bitmap(), images.getTog2Bitmap(),
shortHelpString="Toggle with 2 bitmaps", isToggle=true)
tb.AddCheckTool(60, '', images.getTog1Bitmap(), images.getTog2Bitmap())
EVT_TOOL(self, 60, self.OnToolClick)
EVT_TOOL_RCLICKED(self, 60, self.OnToolRClick)
tb.Realize()
@@ -65,8 +64,6 @@ class TestFloatBar(wxFrame):
def OnToolRClick(self, event):
self.log.WriteText("tool %s right-clicked\n" % event.GetId())
# def test(self, event):
# self.log.WriteText("Button clicked!")
#---------------------------------------------------------------------------

18
wxPython/demo/wxToolBar.py
View File

@@ -23,32 +23,32 @@ class TestToolBar(wxFrame):
self.CreateStatusBar()
tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'")
tb.AddSimpleTool(10, '', images.getNewBitmap(), "New", "Long help for 'New'")
EVT_TOOL(self, 10, self.OnToolClick)
EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)
tb.AddSimpleTool(20, images.getOpenBitmap(), "Open", "Long help for 'Open'")
tb.AddSimpleTool(20, '', images.getOpenBitmap(), "Open", "Long help for 'Open'")
EVT_TOOL(self, 20, self.OnToolClick)
EVT_TOOL_RCLICKED(self, 20, self.OnToolRClick)
tb.AddSeparator()
tb.AddSimpleTool(30, images.getCopyBitmap(), "Copy", "Long help for 'Copy'")
tb.AddSimpleTool(30, '', images.getCopyBitmap(), "Copy", "Long help for 'Copy'")
EVT_TOOL(self, 30, self.OnToolClick)
EVT_TOOL_RCLICKED(self, 30, self.OnToolRClick)
tb.AddSimpleTool(40, images.getPasteBitmap(), "Paste", "Long help for 'Paste'")
tb.AddSimpleTool(40, '', images.getPasteBitmap(), "Paste", "Long help for 'Paste'")
EVT_TOOL(self, 40, self.OnToolClick)
EVT_TOOL_RCLICKED(self, 40, self.OnToolRClick)
tb.AddSeparator()
tool = tb.AddTool(50, images.getTog1Bitmap(),
shortHelpString="Toggle this", isToggle=true)
tool = tb.AddCheckTool(50, '', images.getTog1Bitmap(),
shortHelp="Toggle this")
EVT_TOOL(self, 50, self.OnToolClick)
tb.AddTool(60, images.getTog1Bitmap(), images.getTog2Bitmap(),
shortHelpString="Toggle with 2 bitmaps", isToggle=true)
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