From 278c927dd9d163dd67d90cd5e01e77fecfcbac91 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 10 Jan 2003 23:23:49 +0000 Subject: [PATCH] removed style parameter from MSWCreateToolbar(), it is unneeded git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/tbar95.h | 4 ++-- src/msw/tbar95.cpp | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h index ae0994cb71..b06b0fa46f 100644 --- a/include/wx/msw/tbar95.h +++ b/include/wx/msw/tbar95.h @@ -76,8 +76,8 @@ protected: // common part of all ctors void Init(); - // create the toolbar control - bool MSWCreateToolbar(const wxPoint& pos, const wxSize& size, long style); + // create the native toolbar control + bool MSWCreateToolbar(const wxPoint& pos, const wxSize& size); // recreate the control completely void Recreate(); diff --git a/src/msw/tbar95.cpp b/src/msw/tbar95.cpp index 5716e1a76f..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") ); -- 2.45.2