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 284823fcc33051320c2a429a899026d1b1b44c64..b07e8242779fdb5d4d89ad101a55fa85cdd3a14e 100644 (file)
--- 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,
 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") )
     {
                 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,
     }
     ~wxGenericListCtrl();
 
     bool Create( wxWindow *parent,

-                 wxWindowID id = -1,
+                 wxWindowID winid = -1,

                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLC_ICON,
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLC_ICON,


@@ -253,13 +253,13 @@ class WXDLLEXPORT wxListCtrl: public wxGenericListCtrl
 public:
     wxListCtrl() {}
 
 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") )
                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 dae2b38f23f1a5562bf734e75828af0137b4687e..9172a11fe9058246bda3c47ff9809ad743eaefd6 100644 (file)
--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -342,8 +342,8 @@ private:
 class WXDLLEXPORT wxListEvent : public wxNotifyEvent
 {
 public:
 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)
         , m_code(0)
         , m_oldItemIndex(0)
         , m_itemIndex(0)

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 445e448c662c6baac57a0e4cc4b24a0d642d0299..86f7d56b01aa399f1f7ab10db51fc976193f1542 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -39,14 +39,14 @@ class WXDLLEXPORT wxListView : public wxListCtrl
 public:
     wxListView() { }
     wxListView( wxWindow *parent,
 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") )
     {
                 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
     }
 
     // focus/selection stuff