From 7af76fc14e81e732bf197e127437f54fabb9efe0 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 19 Apr 2006 06:39:43 +0000 Subject: [PATCH] fixing 'id' objc.h collisions git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/carbon/control.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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,