#include "wx/utils.h"
#include "wx/app.h"
#include "wx/log.h"
+ #include "wx/frame.h"
+ #include "wx/dcclient.h"
+ #include "wx/settings.h"
+ #include "wx/image.h"
#endif
-#include "wx/frame.h"
-#include "wx/image.h"
-#include "wx/settings.h"
-#include "wx/dcclient.h"
-
// ----------------------------------------------------------------------------
// wxButtonToolBarTool: our implementation of wxToolBarToolBase
// ----------------------------------------------------------------------------
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 =
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);
}
// ----------------------------------------------------------------------------
m_needsLayout = true;
DoLayout();
- SetBestSize(wxSize(m_maxWidth, m_maxHeight));
+ SetInitialSize(wxSize(m_maxWidth, m_maxHeight));
return true;
}
{
wxBitmapButton* bmpButton = new wxBitmapButton(this, tool->GetId(), tool->GetNormalBitmap(), wxPoint(tool->m_x, tool->m_y), wxDefaultSize,
wxBU_AUTODRAW|wxBORDER_NONE);
- if (!tool->GetShortHelp().IsEmpty())
+ if (!tool->GetShortHelp().empty())
bmpButton->SetLabel(tool->GetShortHelp());
tool->SetButton(bmpButton);
{
sz.y += (m_labelHeight + m_labelMargin);
- if (!tool->GetShortHelp().IsEmpty())
+ if (!tool->GetShortHelp().empty())
{
wxClientDC dc(this);
dc.SetFont(GetFont());
dc.DrawRectangle(backgroundRect);
}
- if (m_labelHeight > 0 && !tool->GetShortHelp().IsEmpty())
+ if (m_labelHeight > 0 && !tool->GetShortHelp().empty())
{
int tw, th;
dc.GetTextExtent(tool->GetShortHelp(), & tw, & th);
{
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, tool->GetId());
event.SetEventObject(tool->GetButton());
- if (!ProcessEvent(event))
+ if (!GetEventHandler()->ProcessEvent(event))
event.Skip();
}
}