inline wxToolBarTool( wxToolBar* pTbar
,wxControl* pControl
+ ,const wxString& label
) : wxToolBarToolBase( pTbar
,pControl
+ ,label
)
{
}
wxToolBarToolBase *wxToolBar::CreateTool(
wxControl* pControl
+, const wxString& label
)
{
return new wxToolBarTool( this
,pControl
+ ,label
);
} // end of wxToolBarSimple::CreateTool
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_MENUBAR));
SetFont(*wxSMALL_FONT);
- if (GetWindowStyleFlag() & wxTB_VERTICAL)
+ if (GetWindowStyleFlag() & (wxTB_LEFT | wxTB_RIGHT))
{
m_vLastX = 7;
m_vLastY = 3;
int nWidth = rSize.x;
int nHeight = rSize.y;
- if (lStyle & (wxTB_HORIZONTAL | wxTB_BOTTOM))
+ if (lStyle & (wxTB_TOP | wxTB_BOTTOM))
{
if (nWidth <= 0)
{
if (pTool->IsSeparator())
{
- if (GetWindowStyleFlag() & (wxTB_HORIZONTAL | wxTB_BOTTOM))
+ if (GetWindowStyleFlag() & (wxTB_TOP | wxTB_BOTTOM))
{
pTool->m_vX = m_vLastX + nSeparatorSize;
pTool->m_vHeight = m_defaultHeight + m_vTextY;
}
else if (pTool->IsButton())
{
- if (GetWindowStyleFlag() & (wxTB_HORIZONTAL | wxTB_BOTTOM))
+ if (GetWindowStyleFlag() & (wxTB_TOP | wxTB_BOTTOM))
{
if (m_nCurrentRowsOrColumns >= m_maxCols)
{
node = node->GetNext();
}
- if (GetWindowStyleFlag() & (wxTB_HORIZONTAL | wxTB_BOTTOM))
+ if (GetWindowStyleFlag() & (wxTB_TOP | wxTB_BOTTOM))
m_maxWidth += nMaxToolWidth;
else
m_maxHeight += nMaxToolHeight;
vDc.SetPen(vDarkGreyPen);
if (HasFlag(wxTB_TEXT))
{
- if (HasFlag(wxTB_HORIZONTAL) || HasFlag(wxTB_BOTTOM))
+ if (HasFlag(wxTB_TOP) || HasFlag(wxTB_BOTTOM))
{
nX = pTool->m_vX;
nY = pTool->m_vY - (m_vTextY - 6);
{
nX = pTool->m_vX;
nY = pTool->m_vY;
- if (HasFlag(wxTB_HORIZONTAL) || HasFlag(wxTB_BOTTOM))
+ if (HasFlag(wxTB_TOP) || HasFlag(wxTB_BOTTOM))
nHeight = pTool->GetHeight() - 2;
else
{