Backported the controls on a toolbar fix for wxMac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-04-16 21:05:53 +00:00
parent 08efbf69b1
commit cf83df6d61
4 changed files with 611 additions and 639 deletions

View File

@@ -57,12 +57,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()