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
This commit is contained in:
@@ -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();
|
||||
|
@@ -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") );
|
||||
|
Reference in New Issue
Block a user