Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Partially applied patch [ 763900 ] fix for vertical toolbar

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-07-10 08:16:00 +00:00
parent bf6e8dc931
commit 3bb63e5c80
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/tbar95.cpp
View File

@@ -361,6 +361,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;
} }
@@ -652,8 +655,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];
@@ -1162,7 +1165,7 @@ void wxToolBar::OnMouseEvent(wxMouseEvent& event)
bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam) 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 // logic (TB_AUTOSIZE) with our horizontal toolbars and other hacks
RECT r; RECT r;
if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) ) if ( ::SendMessage(GetHwnd(), TB_GETITEMRECT, 0, (LPARAM)&r) )