X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07514334147e80f763e6dac075f96c64836f5a8c..41e155b43e45b056738bfd7e25c8c7fe261243f3:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index 3d4ee35534..31196f57c4 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -17,17 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) && !defined(__EMX__) -// Some older compilers (such as EMX) cannot handle -// #pragma interface/implementation correctly, iff -// #pragma implementation is used in _two_ translation -// units (as created by e.g. event.cpp compiled for -// libwx_base and event.cpp compiled for libwx_gui_core). -// So we must not use those pragmas for those compilers in -// such files. - #pragma implementation "event.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -247,14 +236,6 @@ 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 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 DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_TOP) DEFINE_EVENT_TYPE(wxEVT_SCROLLWIN_BOTTOM) @@ -1085,7 +1066,7 @@ void wxEvtHandler::ClearEventLocker() delete m_eventsLocker; m_eventsLocker = NULL; #endif -}; +} #endif // wxUSE_THREADS @@ -1378,7 +1359,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) } return false; -}; +} void wxEvtHandler::DoSetClientObject( wxClientData *data ) {