From: David Elliott <dfe@tgwbd.org>
Date: Mon, 11 Aug 2003 15:14:37 +0000 (+0000)
Subject: Replaced id with winid so it doesn't conflict with the Objective-C type
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f07c570112746633faf3e1bb65ebef4b80dc4770?ds=inline

Replaced id with winid so it doesn't conflict with the Objective-C type


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

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 3624f51c36..f45c5f2f63 100644
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -99,8 +99,8 @@ protected:
 class WXDLLEXPORT wxSpinEvent : public wxNotifyEvent
 {
 public:
-    wxSpinEvent(wxEventType commandType = wxEVT_NULL, int id = 0)
-           : wxNotifyEvent(commandType, id)
+    wxSpinEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)
+           : wxNotifyEvent(commandType, winid)
     {
     }
 
@@ -115,12 +115,12 @@ private:
 typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
 
 // macros for handling spin events
-#define EVT_SPIN_UP(id, func) \
-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEUP, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
-#define EVT_SPIN_DOWN(id, func) \
-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEDOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
-#define EVT_SPIN(id, func) \
-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
+#define EVT_SPIN_UP(winid, func) \
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEUP, winid, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
+#define EVT_SPIN_DOWN(winid, func) \
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_LINEDOWN, winid, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
+#define EVT_SPIN(winid, func) \
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_SCROLL_THUMBTRACK, winid, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func, NULL ),
 
 #endif // wxUSE_SPINBTN