Partially applied patch [ 763900 ] fix for vertical toolbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -368,6 +368,9 @@ WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const
|
|||||||
if ( style & wxTB_NOALIGN )
|
if ( style & wxTB_NOALIGN )
|
||||||
msStyle |= CCS_NOPARENTALIGN;
|
msStyle |= CCS_NOPARENTALIGN;
|
||||||
|
|
||||||
|
if ( style & wxTB_VERTICAL )
|
||||||
|
msStyle |= CCS_VERT;
|
||||||
|
|
||||||
return msStyle;
|
return msStyle;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -659,8 +662,8 @@ 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 - looks ugly
|
||||||
if ( isVertical && tool->IsSeparator() )
|
//if ( isVertical && tool->IsSeparator() )
|
||||||
continue;
|
// continue;
|
||||||
|
|
||||||
TBBUTTON& button = buttons[i];
|
TBBUTTON& button = buttons[i];
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user