X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/170acdc90e9f92f8b8120fa6c04acdbf45c89582..4542739ccb3b2ad47afc66b7a3182568a182b71f:/src/univ/toolbar.cpp diff --git a/src/univ/toolbar.cpp b/src/univ/toolbar.cpp index fafb168d02..ccdff2fd2c 100644 --- a/src/univ/toolbar.cpp +++ b/src/univ/toolbar.cpp @@ -104,8 +104,8 @@ public: m_underMouse = false; } - wxToolBarTool(wxToolBar *tbar, wxControl *control) - : wxToolBarToolBase(tbar, control) + wxToolBarTool(wxToolBar *tbar, wxControl *control, const wxString& label) + : wxToolBarToolBase(tbar, control, label) { // no position yet m_x = @@ -190,6 +190,8 @@ bool wxToolBar::Create(wxWindow *parent, return false; } + FixupStyle(); + CreateInputHandler(wxINP_HANDLER_TOOLBAR); SetInitialSize(size); @@ -326,9 +328,10 @@ wxToolBarToolBase *wxToolBar::CreateTool(int id, clientData, shortHelp, longHelp); } -wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control) +wxToolBarToolBase * +wxToolBar::CreateTool(wxControl *control, const wxString& label) { - return new wxToolBarTool(this, control); + return new wxToolBarTool(this, control, label); } // ----------------------------------------------------------------------------