X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b935bec2368afde72a9451fd431c8039b1194f1f..921176c5e456ac4526ea33c5f0d86ee7401d9016:/include/wx/generic/listctrl.h?ds=sidebyside diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h index 284823fcc3..b07e824277 100644 --- a/include/wx/generic/listctrl.h +++ b/include/wx/generic/listctrl.h @@ -67,19 +67,19 @@ class WXDLLEXPORT wxGenericListCtrl: public wxControl public: wxGenericListCtrl(); wxGenericListCtrl( wxWindow *parent, - wxWindowID id = -1, + wxWindowID winid = -1, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString &name = wxT("listctrl") ) { - Create(parent, id, pos, size, style, validator, name); + Create(parent, winid, pos, size, style, validator, name); } ~wxGenericListCtrl(); bool Create( wxWindow *parent, - wxWindowID id = -1, + wxWindowID winid = -1, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxLC_ICON, @@ -253,13 +253,13 @@ class WXDLLEXPORT wxListCtrl: public wxGenericListCtrl public: wxListCtrl() {} - wxListCtrl(wxWindow *parent, wxWindowID id = -1, + wxListCtrl(wxWindow *parent, wxWindowID winid = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator &validator = wxDefaultValidator, const wxString &name = wxT("listctrl") ) - : wxGenericListCtrl(parent, id, pos, size, style, validator, name) + : wxGenericListCtrl(parent, winid, pos, size, style, validator, name) { } };