X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63ec432bd7b9c93961e85e871bcb31758364a634..90527a50d74bed6ed6b4d163e8170ae8c3f5d869:/include/wx/mac/carbon/control.h diff --git a/include/wx/mac/carbon/control.h b/include/wx/mac/carbon/control.h index 29001f0667..ba818a6076 100644 --- a/include/wx/mac/carbon/control.h +++ b/include/wx/mac/carbon/control.h @@ -21,16 +21,16 @@ class WXDLLEXPORT wxControl : public wxControlBase public: wxControl(); - wxControl(wxWindow *parent, wxWindowID id, + wxControl(wxWindow *parent, wxWindowID winid, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxControlNameStr) { - Create(parent, id, pos, size, style, validator, name); + Create(parent, winid, pos, size, style, validator, name); } - bool Create(wxWindow *parent, wxWindowID id, + bool Create(wxWindow *parent, wxWindowID winid, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator,