X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..f0834140313212fc54d09e28d21a95476d6545f2:/src/msw/tbar95.cpp diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index 9fd39ade69..b0c059dd89 100644 --- a/src/msw/tbar95.cpp +++ b/src/msw/tbar95.cpp @@ -238,7 +238,7 @@ bool wxToolBar::Create(wxWindow *parent, return FALSE; // MSW-specific initialisation - if ( !MSWCreateToolbar(pos, size, style) ) + if ( !MSWCreateToolbar(pos, size) ) return FALSE; // set up the colors and fonts @@ -248,11 +248,9 @@ bool wxToolBar::Create(wxWindow *parent, return TRUE; } -bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, - const wxSize& size, - long style) +bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size) { - if ( !MSWCreateControl(TOOLBARCLASSNAME, _T(""), pos, size, style) ) + if ( !MSWCreateControl(TOOLBARCLASSNAME, _T(""), pos, size) ) return FALSE; // toolbar-specific post initialisation @@ -276,7 +274,7 @@ void wxToolBar::Recreate() UnsubclassWin(); - if ( !MSWCreateToolbar(pos, size, GetWindowStyle()) ) + if ( !MSWCreateToolbar(pos, size) ) { // what can we do? wxFAIL_MSG( _T("recreating the toolbar failed") ); @@ -1197,7 +1195,7 @@ bool wxToolBar::HandleSize(WXWPARAM wParam, WXLPARAM lParam) // FIXME: 6 is hardcoded separator line height... //h += 6; if (HasFlag(wxTB_NODIVIDER)) - h += 3; + h += 4; else h += 6; h *= m_maxRows;