no real change: put event handlers together at the end of the file

[wxWidgets.git] / src / common / appbase.cpp

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 30c7f093b2eeb4649610622bdcfc8c685659f2fd..d159c9bdd8eb71738a15fa4b43e776ff77318fa0 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -164,6 +164,7 @@ bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **argv)
 
 #if wxUSE_THREADS
     wxHandlersWithPendingEventsLocker = new wxCriticalSection;
 
 #if wxUSE_THREADS
     wxHandlersWithPendingEventsLocker = new wxCriticalSection;

+    wxHandlersWithPendingDelayedEvents = new wxList;

 #endif
 
 #ifndef __WXPALMOS__
 #endif
 
 #ifndef __WXPALMOS__


@@ -193,6 +194,9 @@ void wxAppConsoleBase::CleanUp()
     delete wxHandlersWithPendingEvents;
     wxHandlersWithPendingEvents = NULL;
 
     delete wxHandlersWithPendingEvents;
     wxHandlersWithPendingEvents = NULL;
 

+    delete wxHandlersWithPendingDelayedEvents;
+    wxHandlersWithPendingDelayedEvents = NULL;
+

 #if wxUSE_THREADS
     delete wxHandlersWithPendingEventsLocker;
     wxHandlersWithPendingEventsLocker = NULL;
 #if wxUSE_THREADS
     delete wxHandlersWithPendingEventsLocker;
     wxHandlersWithPendingEventsLocker = NULL;


@@ -336,6 +340,16 @@ bool wxAppConsoleBase::HasPendingEvents() const
     return has;
 }
 
     return has;
 }
 

+void wxAppConsoleBase::SuspendProcessingOfPendingEvents()
+{
+    wxENTER_CRIT_SECT( *wxHandlersWithPendingEventsLocker );
+}
+
+void wxAppConsoleBase::ResumeProcessingOfPendingEvents()
+{
+    wxLEAVE_CRIT_SECT( *wxHandlersWithPendingEventsLocker );
+}
+

 /* static */
 bool wxAppConsoleBase::IsMainLoopRunning()
 {
 /* static */
 bool wxAppConsoleBase::IsMainLoopRunning()
 {


@@ -353,6 +367,9 @@ void wxAppConsoleBase::ProcessPendingEvents()
 
     wxENTER_CRIT_SECT( *wxHandlersWithPendingEventsLocker );
 
 
     wxENTER_CRIT_SECT( *wxHandlersWithPendingEventsLocker );
 

+    wxCHECK_RET( wxHandlersWithPendingDelayedEvents->IsEmpty(),
+                 "this helper list should be empty" );
+

     if (wxHandlersWithPendingEvents)
     {
         // iterate until the list becomes empty: the handlers remove themselves
     if (wxHandlersWithPendingEvents)
     {
         // iterate until the list becomes empty: the handlers remove themselves


@@ -360,7 +377,7 @@ void wxAppConsoleBase::ProcessPendingEvents()
         wxList::compatibility_iterator node = wxHandlersWithPendingEvents->GetFirst();
         while (node)
         {
         wxList::compatibility_iterator node = wxHandlersWithPendingEvents->GetFirst();
         while (node)
         {

-            // In ProcessPendingEvents(), new handlers might be add
+            // In ProcessPendingEvents(), new handlers might be added

             // and we can safely leave the critical section here.
             wxLEAVE_CRIT_SECT( *wxHandlersWithPendingEventsLocker );
 
             // and we can safely leave the critical section here.
             wxLEAVE_CRIT_SECT( *wxHandlersWithPendingEventsLocker );
 


@@ -374,6 +391,20 @@ void wxAppConsoleBase::ProcessPendingEvents()
         }
     }
 
         }
     }
 

+    // now the wxHandlersWithPendingEvents is surely empty; however some event
+    // handlers may have moved themselves into wxHandlersWithPendingDelayedEvents
+    // because of a selective wxYield call in progress.
+    // Now we need to move them back to wxHandlersWithPendingEvents so the next
+    // call to this function has the chance of processing them:
+    if (!wxHandlersWithPendingDelayedEvents->IsEmpty())
+    {
+        if (!wxHandlersWithPendingEvents)
+            wxHandlersWithPendingEvents = new wxList;
+
+        WX_APPEND_LIST(wxHandlersWithPendingEvents, wxHandlersWithPendingDelayedEvents);
+        wxHandlersWithPendingDelayedEvents->Clear();
+    }
+

     wxLEAVE_CRIT_SECT( *wxHandlersWithPendingEventsLocker );
 }
 
     wxLEAVE_CRIT_SECT( *wxHandlersWithPendingEventsLocker );
 }