cleanup for wxUSE_THREADS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
de4de64f1c
commit
7fdfc5b3a2
@ -272,6 +272,7 @@ void wxAppConsole::ProcessPendingEvents()
|
|||||||
#if wxUSE_THREADS
|
#if wxUSE_THREADS
|
||||||
if ( !wxPendingEventsLocker )
|
if ( !wxPendingEventsLocker )
|
||||||
return;
|
return;
|
||||||
|
#endif
|
||||||
|
|
||||||
// ensure that we're the only thread to modify the pending events list
|
// ensure that we're the only thread to modify the pending events list
|
||||||
wxENTER_CRIT_SECT( *wxPendingEventsLocker );
|
wxENTER_CRIT_SECT( *wxPendingEventsLocker );
|
||||||
@ -281,7 +282,6 @@ void wxAppConsole::ProcessPendingEvents()
|
|||||||
wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
|
wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
// iterate until the list becomes empty
|
// iterate until the list becomes empty
|
||||||
wxList::compatibility_iterator node = wxPendingEvents->GetFirst();
|
wxList::compatibility_iterator node = wxPendingEvents->GetFirst();
|
||||||
@ -290,24 +290,18 @@ void wxAppConsole::ProcessPendingEvents()
|
|||||||
wxEvtHandler *handler = (wxEvtHandler *)node->GetData();
|
wxEvtHandler *handler = (wxEvtHandler *)node->GetData();
|
||||||
wxPendingEvents->Erase(node);
|
wxPendingEvents->Erase(node);
|
||||||
|
|
||||||
#if wxUSE_THREADS
|
|
||||||
// In ProcessPendingEvents(), new handlers might be add
|
// In ProcessPendingEvents(), new handlers might be add
|
||||||
// and we can safely leave the critical section here.
|
// and we can safely leave the critical section here.
|
||||||
wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
|
wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
|
||||||
#endif
|
|
||||||
|
|
||||||
handler->ProcessPendingEvents();
|
handler->ProcessPendingEvents();
|
||||||
|
|
||||||
#if wxUSE_THREADS
|
|
||||||
wxENTER_CRIT_SECT( *wxPendingEventsLocker );
|
wxENTER_CRIT_SECT( *wxPendingEventsLocker );
|
||||||
#endif
|
|
||||||
|
|
||||||
node = wxPendingEvents->GetFirst();
|
node = wxPendingEvents->GetFirst();
|
||||||
}
|
}
|
||||||
|
|
||||||
#if wxUSE_THREADS
|
|
||||||
wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
|
wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int wxAppConsole::FilterEvent(wxEvent& WXUNUSED(event))
|
int wxAppConsole::FilterEvent(wxEvent& WXUNUSED(event))
|
||||||
|
Loading…
Reference in New Issue
Block a user