Changed all symbols with the name "id" to "winid" to allow Objective-C++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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)
|
||||
{
|
||||
}
|
||||
};
|
||||
|
Reference in New Issue
Block a user