Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ensure that ProcessEvent() is called for all the event handlers, not just the first one in event handlers list

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-16 16:07:16 +00:00
parent 23efa4bfb9
commit 29de6f400c
2 changed files with 58 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/common/event.cpp
View File

@@ -352,6 +352,7 @@ wxEvent::wxEvent(int theId, wxEventType commandType )
m_callbackUserData = NULL;
m_isCommandEvent = false;
m_propagationLevel = wxEVENT_PROPAGATE_NONE;
m_wasProcessed = false;
}
wxEvent::wxEvent(const wxEvent& src)
@@ -364,6 +365,7 @@ wxEvent::wxEvent(const wxEvent& src)
, m_propagationLevel(src.m_propagationLevel)
, m_skipped(src.m_skipped)
, m_isCommandEvent(src.m_isCommandEvent)
, m_wasProcessed(false)
{
}
@@ -380,6 +382,8 @@ wxEvent& wxEvent::operator=(const wxEvent& src)
m_skipped = src.m_skipped;
m_isCommandEvent = src.m_isCommandEvent;
// don't change m_wasProcessed
return *this;
}
@@ -1263,22 +1267,35 @@ bool wxEvtHandler::TryParent(wxEvent& event)
bool wxEvtHandler::ProcessEvent(wxEvent& event)
{
// allow the application to hook into event processing
if ( wxTheApp )
//
// note that we should only do it if we're the first event handler called
// to avoid calling FilterEvent() multiple times as the event goes through
// the event handler chain and possibly upwards the window hierarchy
if ( !event.WasProcessed() )
{
int rc = wxTheApp->FilterEvent(event);
if ( rc != -1 )
if ( wxTheApp )
{
wxASSERT_MSG( rc == 1 || rc == 0,
_T("unexpected wxApp::FilterEvent return value") );
int rc = wxTheApp->FilterEvent(event);
if ( rc != -1 )
{
wxASSERT_MSG( rc == 1 || rc == 0,
"unexpected wxApp::FilterEvent return value" );
return rc != 0;
return rc != 0;
}
//else: proceed normally
}
//else: proceed normally
}
if ( ProcessEventHere(event) )
return true;
// pass the event to the next handler, notice that we shouldn't call
// TryParent() even if it doesn't handle the event as the last handler in
// the chain will do it
if ( GetNextHandler() )
return GetNextHandler()->ProcessEvent(event);
// propagate the event upwards the window chain and/or to the application
// object if it wasn't processed at this level
return TryParent(event);
@@ -1286,25 +1303,21 @@ bool wxEvtHandler::ProcessEvent(wxEvent& event)
bool wxEvtHandler::ProcessEventHere(wxEvent& event)
{
// An event handler can be enabled or disabled
if ( GetEvtHandlerEnabled() )
{
// if we have a validator, it has higher priority than our own event
// table
if ( TryValidator(event) )
return true;
// If the event handler is disabled it doesn't process any events
if ( !GetEvtHandlerEnabled() )
return false;
// Handle per-instance dynamic event tables first
if ( m_dynamicEvents && SearchDynamicEventTable(event) )
return true;
// If we have a validator, it has higher priority than our own event
// handlers
if ( TryValidator(event) )
return true;
// Then static per-class event tables
if ( GetEventHashTable().HandleEvent(event, this) )
return true;
}
// Handle per-instance dynamic event tables first
if ( m_dynamicEvents && SearchDynamicEventTable(event) )
return true;
// Try going down the event handler chain
if ( GetNextHandler() && GetNextHandler()->ProcessEventHere(event) )
// Then static per-class event tables
if ( GetEventHashTable().HandleEvent(event, this) )
return true;
// We don't have a handler for this event.