forward port from 2.8

[wxWidgets.git] / include / wx / mac / carbon / control.h

diff --git a/include/wx/mac/carbon/control.h b/include/wx/mac/carbon/control.h
index 29001f066766378814ef8b70756f3e7d94203a11..ba818a6076aaba7c2d72cdfa55e6a2fce6b1045f 100644 (file)
--- 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,