Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-08-11 15:14:37 +00:00
parent 25a4727e95
commit f07c570112
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/spinbutt.h
View File

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