readded wxEVT_SCROLL_ENDSCROLL symbol back to the library to fix (inadvertent) backwards binary compatibility breakage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
9a77c30be4
commit
d008a4a6bb
@ -2813,8 +2813,21 @@ typedef void (wxEvtHandler::*wxMouseCaptureChangedEventFunction)(wxMouseCaptureC
|
||||
EVT_COMMAND_SCROLL_THUMBRELEASE(winid, func) \
|
||||
EVT_COMMAND_SCROLL_CHANGED(winid, func)
|
||||
|
||||
// this is the old name of this event, to be deprecated in 2.8
|
||||
#define wxEVT_SCROLL_ENDSCROLL wxEVT_SCROLL_CHANGED
|
||||
// compatibility macros for the old name, to be deprecated in 2.8
|
||||
//
|
||||
// note that simply #defines suffice for the macro names as they're only
|
||||
// present in the source code and macros are enough to maintain source
|
||||
// backwards compatibility, but that we have to ensure that we also have
|
||||
// wxEVT_SCROLL_ENDSCROLL inside the library for binary backwards compatibility
|
||||
// and this can't be done with a macro
|
||||
#if wxCHECK_VERSION(2, 7, 0)
|
||||
// replace the line below with simply
|
||||
// #define wxEVT_SCROLL_ENDSCROLL wxEVT_SCROLL_CHANGED
|
||||
// in 2.7
|
||||
#error "Remove wxEVT_SCROLL_ENDSCROLL binary compatibility hack, not needed"
|
||||
#endif
|
||||
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_ENDSCROLL;
|
||||
|
||||
#define EVT_COMMAND_SCROLL_ENDSCROLL EVT_COMMAND_SCROLL_CHANGED
|
||||
#define EVT_SCROLL_ENDSCROLL EVT_SCROLL_CHANGED
|
||||
|
||||
|
@ -247,6 +247,12 @@ DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBTRACK)
|
||||
DEFINE_EVENT_TYPE(wxEVT_SCROLL_THUMBRELEASE)
|
||||
DEFINE_EVENT_TYPE(wxEVT_SCROLL_CHANGED)
|
||||
|
||||
// see comments in wx/event.h, near wxEVT_SCROLL_ENDSCROLL declaration
|
||||
#if wxCHECK_VERSION(2, 7, 0)
|
||||
#error "Remove the line below, not needed any more"
|
||||
#endif
|
||||
const wxEventType wxEVT_SCROLL_ENDSCROLL = wxEVT_SCROLL_CHANGED;
|
||||
|
||||
// Scroll events from wxWindow
|
||||
DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP)
|
||||
DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_BOTTOM)
|
||||
|
Loading…
Reference in New Issue
Block a user