X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e4a197e4c60e461b8068b0619692ea083e30b8b..0b9d8fe18e02e9d848d205c3f36812cd56fc1bcd:/wxPython/demo/wxToolBar.py diff --git a/wxPython/demo/wxToolBar.py b/wxPython/demo/wxToolBar.py index 9867b98f05..a22833e37a 100644 --- a/wxPython/demo/wxToolBar.py +++ b/wxPython/demo/wxToolBar.py @@ -23,6 +23,8 @@ class TestToolBar(wxFrame): # wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT) #self.SetToolBar(tb) + log.write("Default toolbar tool size: %s\n" % tb.GetToolBitmapSize()) + self.CreateStatusBar() tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'") @@ -57,12 +59,12 @@ class TestToolBar(wxFrame): EVT_TOOL_RCLICKED(self, -1, self.OnToolRClick) # Match all EVT_TIMER(self, -1, self.OnClearSB) - if wxPlatform != "__WXMAC__": - tb.AddSeparator() - 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.AddSeparator() + 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.AddControl(wxTextCtrl(tb, -1, "Toolbar controls!!", size=(150, -1))) tb.Realize()