From 02221dcb0a284f538bd65ad9229e2f37e4e4c291 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 21 Jan 2009 22:32:05 +0000 Subject: [PATCH] fix problem with using wxEVT_SPIN in event tables after new events patch git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/spinbutt.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h index a068833a98..164eaa53d9 100644 --- a/include/wx/spinbutt.h +++ b/include/wx/spinbutt.h @@ -127,13 +127,17 @@ typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&); #define wxSpinEventHandler(func) \ wxEVENT_HANDLER_CAST(wxSpinEventFunction, func) -// macros for handling spin events +// macros for handling spin events: notice that we must use the real values of +// the event type constants and not their references (wxEVT_SPIN[_UP/DOWN]) +// here as otherwise the event tables could end up with non-initialized +// (because of undefined initialization order of the globals defined in +// different translation units) references in them #define EVT_SPIN_UP(winid, func) \ - wx__DECLARE_EVT1(wxEVT_SPIN_UP, winid, wxSpinEventHandler(func)) + wx__DECLARE_EVT1(wxEVT_SCROLL_LINEUP, winid, wxSpinEventHandler(func)) #define EVT_SPIN_DOWN(winid, func) \ - wx__DECLARE_EVT1(wxEVT_SPIN_DOWN, winid, wxSpinEventHandler(func)) + wx__DECLARE_EVT1(wxEVT_SCROLL_LINEDOWN, winid, wxSpinEventHandler(func)) #define EVT_SPIN(winid, func) \ - wx__DECLARE_EVT1(wxEVT_SPIN, winid, wxSpinEventHandler(func)) + wx__DECLARE_EVT1(wxEVT_SCROLL_THUMBTRACK, winid, wxSpinEventHandler(func)) #endif // wxUSE_SPINBTN -- 2.50.0