From: David Elliott <dfe@tgwbd.org>
Date: Mon, 27 Oct 2003 04:12:45 +0000 (+0000)
Subject: Changed all symbols with the name "id" to "winid" to allow Objective-C++
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/921176c5e456ac4526ea33c5f0d86ee7401d9016?ds=inline;hp=b935bec2368afde72a9451fd431c8039b1194f1f

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
---

diff --git a/include/wx/generic/listctrl.h b/include/wx/generic/listctrl.h
index 284823fcc3..b07e824277 100644
--- a/include/wx/generic/listctrl.h
+++ b/include/wx/generic/listctrl.h
@@ -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)
     {
     }
 };
diff --git a/include/wx/listbase.h b/include/wx/listbase.h
index dae2b38f23..9172a11fe9 100644
--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -342,8 +342,8 @@ private:
 class WXDLLEXPORT wxListEvent : public wxNotifyEvent
 {
 public:
-    wxListEvent(wxEventType commandType = wxEVT_NULL, int id = 0)
-        : wxNotifyEvent(commandType, id)
+    wxListEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)
+        : wxNotifyEvent(commandType, winid)
         , m_code(0)
         , m_oldItemIndex(0)
         , m_itemIndex(0)
diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 445e448c66..86f7d56b01 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -39,14 +39,14 @@ class WXDLLEXPORT wxListView : public wxListCtrl
 public:
     wxListView() { }
     wxListView( wxWindow *parent,
-                wxWindowID id = -1,
+                wxWindowID winid = -1,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxLC_REPORT,
                 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);
     }
 
     // focus/selection stuff