X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02761f6cd478e3c2c97cf6f93442747f7b029833..72366f68d1036084d1adc5971eeee4885f36fe5c:/src/common/event.cpp?ds=sidebyside diff --git a/src/common/event.cpp b/src/common/event.cpp index 043eafa869..df764235ac 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -1011,6 +1011,10 @@ wxEvtHandler::wxEvtHandler() m_eventsLocker = new wxCriticalSection; # endif #endif + // reentrace not allowed by default + m_reentranceAllowed = false; + m_eventHandlingInProgress = false; + // no client data (yet) m_clientData = NULL; m_clientDataType = wxClientData_None; @@ -1131,10 +1135,13 @@ void wxEvtHandler::AddPendingEvent(wxEvent& event) void wxEvtHandler::ProcessPendingEvents() { - // this method is only called by wxApp if this handler does have pending - // events + // this method is only called by wxApp if this handler does have + // pending events wxCHECK_RET( m_pendingEvents, wxT("Please call wxApp::ProcessPendingEvents() instead") ); + + // eventhandling is now in progess + m_eventHandlingInProgress = true; wxENTER_CRIT_SECT( Lock() ); @@ -1152,11 +1159,13 @@ void wxEvtHandler::ProcessPendingEvents() // It's importan we remove event from list before processing it. // Else a nested event loop, for example from a modal dialog, might // process the same event again. + m_pendingEvents->Erase(node); wxLEAVE_CRIT_SECT( Lock() ); ProcessEvent(*event); + delete event; wxENTER_CRIT_SECT( Lock() ); @@ -1166,6 +1175,9 @@ void wxEvtHandler::ProcessPendingEvents() } wxLEAVE_CRIT_SECT( Lock() ); + + // eventhandling no longer in progess + m_eventHandlingInProgress = false; } /*