added labels support for toolbar controls for wxMac and wxMSW (modified patch 1613603)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-18 23:13:18 +00:00
parent 88c23b64c7
commit cdb11cb99e
13 changed files with 235 additions and 105 deletions

View File

@@ -66,8 +66,10 @@ public:
m_button = NULL;
}
wxButtonToolBarTool(wxButtonToolBar *tbar, wxControl *control)
: wxToolBarToolBase(tbar, control)
wxButtonToolBarTool(wxButtonToolBar *tbar,
wxControl *control,
const wxString& label)
: wxToolBarToolBase(tbar, control, label)
{
m_x = m_y = wxDefaultCoord;
m_width =
@@ -271,9 +273,10 @@ wxToolBarToolBase *wxButtonToolBar::CreateTool(int id,
clientData, shortHelp, longHelp);
}
wxToolBarToolBase *wxButtonToolBar::CreateTool(wxControl *control)
wxToolBarToolBase *wxButtonToolBar::CreateTool(wxControl *control,
const wxString& label)
{
return new wxButtonToolBarTool(this, control);
return new wxButtonToolBarTool(this, control, label);
}
// ----------------------------------------------------------------------------