X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..71414756b2cb4d64ee167e61f3fa4854c4f2a85b:/include/wx/generic/statusbr.h diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h index fe00d93e30..9b07b71469 100644 --- a/include/wx/generic/statusbr.h +++ b/include/wx/generic/statusbr.h @@ -5,8 +5,8 @@ // Modified by: VZ at 05.02.00 to derive from wxStatusBarBase // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_GENERIC_STATUSBR_H_ @@ -27,7 +27,7 @@ class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase public: wxStatusBarGeneric() { Init(); } wxStatusBarGeneric(wxWindow *parent, - wxWindowID id, + wxWindowID winid, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -35,30 +35,30 @@ public: { Init(); - Create(parent, id, pos, size, style, name); + Create(parent, winid, pos, size, style, name); } wxStatusBarGeneric(wxWindow *parent, - wxWindowID id, + wxWindowID winid, long style, const wxString& name = wxPanelNameStr) { Init(); - Create(parent, id, style, name); + Create(parent, winid, style, name); } virtual ~wxStatusBarGeneric(); - bool Create(wxWindow *parent, wxWindowID id, + bool Create(wxWindow *parent, wxWindowID winid, const wxPoint& WXUNUSED(pos) = wxDefaultPosition, const wxSize& WXUNUSED(size) = wxDefaultSize, long style = 0, const wxString& name = wxPanelNameStr) { - return Create(parent, id, style, name); + return Create(parent, winid, style, name); } - bool Create(wxWindow *parent, wxWindowID id, + bool Create(wxWindow *parent, wxWindowID winid, long style, const wxString& name = wxPanelNameStr);