Make wxEVT_SCROLL_ENDSCROLL a #define in event.h so that new applications

won't depend on it, and so will be compatible with 2.6.1 libs. But still
define and export it in event.cpp so that 2.6.0 apps will be able to use
2.6.1.1 libs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell 2005-06-30 00:52:05 +00:00
parent 97799a969b
commit 0751433414
2 changed files with 5 additions and 10 deletions

View File

@ -2819,15 +2819,8 @@ typedef void (wxEvtHandler::*wxMouseCaptureChangedEventFunction)(wxMouseCaptureC
// 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;
// and this is done in event.cpp
#define wxEVT_SCROLL_ENDSCROLL wxEVT_SCROLL_CHANGED
#define EVT_COMMAND_SCROLL_ENDSCROLL EVT_COMMAND_SCROLL_CHANGED
#define EVT_SCROLL_ENDSCROLL EVT_SCROLL_CHANGED

View File

@ -249,8 +249,10 @@ 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"
#error "Remove the lines below, not needed any more"
#endif
#undef wxEVT_SCROLL_ENDSCROLL
extern WXDLLIMPEXP_CORE const wxEventType wxEVT_SCROLL_ENDSCROLL;
const wxEventType wxEVT_SCROLL_ENDSCROLL = wxEVT_SCROLL_CHANGED;
// Scroll events from wxWindow