From: Vadim Zeitlin Date: Fri, 27 Feb 2009 10:21:38 +0000 (+0000) Subject: move functions using deprecated methods out of line to avoid deprecation warnings... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2d8c0c2ce4e72ac4c785305d7fdeddda607b3467 move functions using deprecated methods out of line to avoid deprecation warnings from MSVC when building any code including wx/event.h git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/event.h b/include/wx/event.h index f737b25077..302036e45e 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -3093,30 +3093,13 @@ protected: // this one is called before trying our own event table to allow plugging // in the event handlers overriding the default logic, this is used by e.g. // validators. - virtual bool TryBefore(wxEvent& event) - { -#ifdef WXWIN_COMPATIBILITY_2_8 - // call the old virtual function to keep the code overriding it working - return TryValidator(event); -#else - wxUnusedVar(event); - return false; -#endif - } + virtual bool TryBefore(wxEvent& event); // this one is called after failing to find the event handle in our own // table to give a chance to the other windows to process it // // base class implementation passes the event to wxTheApp - virtual bool TryAfter(wxEvent& event) - { -#ifdef WXWIN_COMPATIBILITY_2_8 - // as above, call the old virtual function for compatibility - return TryParent(event); -#else - return DoTryApp(event); -#endif - } + virtual bool TryAfter(wxEvent& event); #ifdef WXWIN_COMPATIBILITY_2_8 // deprecated method: override TryBefore() instead of this one diff --git a/src/common/event.cpp b/src/common/event.cpp index 70248469f0..af8b2ac1b2 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -1296,6 +1296,27 @@ bool wxEvtHandler::DoTryApp(wxEvent& event) return false; } +bool wxEvtHandler::TryBefore(wxEvent& event) +{ +#ifdef WXWIN_COMPATIBILITY_2_8 + // call the old virtual function to keep the code overriding it working + return TryValidator(event); +#else + wxUnusedVar(event); + return false; +#endif +} + +bool wxEvtHandler::TryAfter(wxEvent& event) +{ +#ifdef WXWIN_COMPATIBILITY_2_8 + // as above, call the old virtual function for compatibility + return TryParent(event); +#else + return DoTryApp(event); +#endif +} + bool wxEvtHandler::ProcessEvent(wxEvent& event) { // allow the application to hook into event processing