correction to the separators in vertical toolbar after patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -659,9 +659,14 @@ bool wxToolBar::Realize()
|
|||||||
{
|
{
|
||||||
wxToolBarToolBase *tool = node->GetData();
|
wxToolBarToolBase *tool = node->GetData();
|
||||||
|
|
||||||
// don't add separators to the vertical toolbar - looks ugly
|
// don't add separators to the vertical toolbar with old comctl32.dll
|
||||||
//if ( isVertical && tool->IsSeparator() )
|
// versions as they didn't handle this properly
|
||||||
// continue;
|
if ( isVertical && tool->IsSeparator() &&
|
||||||
|
wxTheApp->GetComCtl32Version() <= 472 )
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
TBBUTTON& button = buttons[i];
|
TBBUTTON& button = buttons[i];
|
||||||
|
|
||||||
@@ -1195,12 +1200,8 @@ bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam)
|
|||||||
h = r.bottom - r.top;
|
h = r.bottom - r.top;
|
||||||
if ( m_maxRows )
|
if ( m_maxRows )
|
||||||
{
|
{
|
||||||
// FIXME: 6 is hardcoded separator line height...
|
// FIXME: hardcoded separator line height...
|
||||||
//h += 6;
|
h += HasFlag(wxTB_NODIVIDER) ? 4 : 6;
|
||||||
if (HasFlag(wxTB_NODIVIDER))
|
|
||||||
h += 4;
|
|
||||||
else
|
|
||||||
h += 6;
|
|
||||||
h *= m_maxRows;
|
h *= m_maxRows;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user