X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d008a4a6bbe96efc758c76db2234fb68d482667c..02bcd285fac7124a41292d905609220005f51087:/src/common/event.cpp diff --git a/src/common/event.cpp b/src/common/event.cpp index 7af4275db2..ffd7048bb4 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" @@ -249,8 +238,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 @@ -1083,7 +1074,7 @@ void wxEvtHandler::ClearEventLocker() delete m_eventsLocker; m_eventsLocker = NULL; #endif -}; +} #endif // wxUSE_THREADS @@ -1376,7 +1367,7 @@ bool wxEvtHandler::SearchDynamicEventTable( wxEvent& event ) } return false; -}; +} void wxEvtHandler::DoSetClientObject( wxClientData *data ) {