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
This commit is contained in:
Vadim Zeitlin
2009-02-27 10:21:38 +00:00
parent 492d6611d4
commit 2d8c0c2ce4
2 changed files with 23 additions and 19 deletions

View File

@@ -3093,30 +3093,13 @@ protected:
// this one is called before trying our own event table to allow plugging // 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. // in the event handlers overriding the default logic, this is used by e.g.
// validators. // validators.
virtual bool TryBefore(wxEvent& event) 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
}
// this one is called after failing to find the event handle in our own // 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 // table to give a chance to the other windows to process it
// //
// base class implementation passes the event to wxTheApp // base class implementation passes the event to wxTheApp
virtual bool TryAfter(wxEvent& event) 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
}
#ifdef WXWIN_COMPATIBILITY_2_8 #ifdef WXWIN_COMPATIBILITY_2_8
// deprecated method: override TryBefore() instead of this one // deprecated method: override TryBefore() instead of this one

View File

@@ -1296,6 +1296,27 @@ bool wxEvtHandler::DoTryApp(wxEvent& event)
return false; 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) bool wxEvtHandler::ProcessEvent(wxEvent& event)
{ {
// allow the application to hook into event processing // allow the application to hook into event processing