From 3bb63e5c806e7ef549673822dc6e4d40aa9dbec9 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 10 Jul 2003 08:16:00 +0000 Subject: [PATCH] Partially applied patch [ 763900 ] fix for vertical toolbar git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/tbar95.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index 3af9bfe8e8..1379da5ace 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -361,6 +361,9 @@ WXDWORD wxToolBar::MSWGetStyle(long style, WXDWORD *exstyle) const if ( style & wxTB_NOALIGN ) msStyle |= CCS_NOPARENTALIGN; + if ( style & wxTB_VERTICAL ) + msStyle |= CCS_VERT; + return msStyle; } @@ -652,8 +655,8 @@ bool wxToolBar::Realize() wxToolBarToolBase *tool = node->GetData(); // don't add separators to the vertical toolbar - looks ugly - if ( isVertical && tool->IsSeparator() ) - continue; + //if ( isVertical && tool->IsSeparator() ) + // continue; TBBUTTON& button = buttons[i]; @@ -1162,7 +1165,7 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event) bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam) { - // calculate our minor dimenstion ourselves - we're confusing the standard + // calculate our minor dimension ourselves - we're confusing the standard // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks RECT r; if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) ) -- 2.47.2