Use variable name winid instead of id. id is a typedef in Objective-C headers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/cocoa/button.h b/include/wx/cocoa/button.h
index a33f669a1c1dec438363ce637b7aa635cfed5656..b0ecb12f7a251e1ff77aafe52479084aa9408e14 100644 (file)
--- a/include/wx/cocoa/button.h
+++ b/include/wx/cocoa/button.h
@@ -37,14 +37,14 @@ public:
         Create(parent, winid, label, pos, size, style, validator, name);
     }
     
         Create(parent, winid, label, pos, size, style, validator, name);
     }
     

-    wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock,
+    wxButton(wxWindow *parent, wxWindowID winid, wxStockItemID stock,

            const wxString& descriptiveLabel = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr)
     {
            const wxString& descriptiveLabel = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr)
     {

-        Create(parent, id, stock, descriptiveLabel, pos, style, validator, name);
+        Create(parent, winid, stock, descriptiveLabel, pos, style, validator, name);

     }
 
     bool Create(wxWindow *parent, wxWindowID winid,
     }
 
     bool Create(wxWindow *parent, wxWindowID winid,


@@ -54,14 +54,14 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxButtonNameStr);
     
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxButtonNameStr);
     

-    bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock,
+    bool Create(wxWindow *parent, wxWindowID winid, wxStockItemID stock,

            const wxString& descriptiveLabel = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr)
     {
            const wxString& descriptiveLabel = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr)
     {

-        return CreateStock(parent, id, stock, descriptiveLabel,
+        return CreateStock(parent, winid, stock, descriptiveLabel,

                            pos, style, validator, name);
     }
     
                            pos, style, validator, name);
     }