no real change: rename wxPendingEvents to wxHandlersWithPendingEvents since its curre...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/app.h b/include/wx/app.h
index 2efde737db1bfa1a0d2172fc4a19703a60fcf185..d61b3b56137866ad9b19dd30df00d844b4f250c3 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -244,8 +244,8 @@ public:
     // (already) be dispatched
     static bool IsMainLoopRunning();
 
     // (already) be dispatched
     static bool IsMainLoopRunning();
 

-    // process all events in the wxPendingEvents list -- it is necessary to
-    // call this function to process posted events. This happens during each
+    // process all events in the wxHandlersWithPendingEvents list -- it is necessary
+    // to call this function to process posted events. This happens during each

     // event loop iteration in GUI mode but if there is no main loop, it may be
     // also called directly.
     virtual void ProcessPendingEvents();
     // event loop iteration in GUI mode but if there is no main loop, it may be
     // also called directly.
     virtual void ProcessPendingEvents();

diff --git a/include/wx/event.h b/include/wx/event.h
index 23f1f353766161d4875c69aec522820da80267c2..a1676933ff7b49aab4d48c4545d847b28147ab36 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -3080,9 +3080,9 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
 // list containing event handlers with pending events for them
 //
 // notice that each event handler should occur at most once in this list
 // list containing event handlers with pending events for them
 //
 // notice that each event handler should occur at most once in this list

-extern WXDLLIMPEXP_BASE wxList *wxPendingEvents;
+extern WXDLLIMPEXP_BASE wxList *wxHandlersWithPendingEvents;

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    extern WXDLLIMPEXP_BASE wxCriticalSection *wxPendingEventsLocker;
+    extern WXDLLIMPEXP_BASE wxCriticalSection *wxHandlersWithPendingEventsLocker;

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 5a741b70ac439b3c2148aafe03a821f4aa963536..a02e091ff1575b84454f4997b9b9dff2f473cd7a 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -163,7 +163,7 @@ bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **argv)
 #endif // wxUSE_INTL
 
 #if wxUSE_THREADS
 #endif // wxUSE_INTL
 
 #if wxUSE_THREADS

-    wxPendingEventsLocker = new wxCriticalSection;
+    wxHandlersWithPendingEventsLocker = new wxCriticalSection;

 #endif
 
 #ifndef __WXPALMOS__
 #endif
 
 #ifndef __WXPALMOS__


@@ -190,12 +190,12 @@ void wxAppConsoleBase::CleanUp()
         m_mainLoop = NULL;
     }
 
         m_mainLoop = NULL;
     }
 

-    delete wxPendingEvents;
-    wxPendingEvents = NULL;
+    delete wxHandlersWithPendingEvents;
+    wxHandlersWithPendingEvents = NULL;

 
 #if wxUSE_THREADS
 
 #if wxUSE_THREADS

-    delete wxPendingEventsLocker;
-    wxPendingEventsLocker = NULL;
+    delete wxHandlersWithPendingEventsLocker;
+    wxHandlersWithPendingEventsLocker = NULL;

 #endif // wxUSE_THREADS
 }
 
 #endif // wxUSE_THREADS
 }
 


@@ -327,11 +327,11 @@ bool wxAppConsoleBase::Dispatch()
 
 bool wxAppConsoleBase::HasPendingEvents() const
 {
 
 bool wxAppConsoleBase::HasPendingEvents() const
 {

-    wxENTER_CRIT_SECT( *wxPendingEventsLocker );
+    wxENTER_CRIT_SECT( *wxHandlersWithPendingEventsLocker );

 
 

-    bool has = wxPendingEvents && !wxPendingEvents->IsEmpty();
+    bool has = wxHandlersWithPendingEvents && !wxHandlersWithPendingEvents->IsEmpty();

 
 

-    wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+    wxLEAVE_CRIT_SECT( *wxHandlersWithPendingEventsLocker );

 
     return has;
 }
 
     return has;
 }


@@ -347,34 +347,34 @@ bool wxAppConsoleBase::IsMainLoopRunning()
 void wxAppConsoleBase::ProcessPendingEvents()
 {
 #if wxUSE_THREADS
 void wxAppConsoleBase::ProcessPendingEvents()
 {
 #if wxUSE_THREADS

-    if ( !wxPendingEventsLocker )
+    if ( !wxHandlersWithPendingEventsLocker )

         return;
 #endif
 
         return;
 #endif
 

-    wxENTER_CRIT_SECT( *wxPendingEventsLocker );
+    wxENTER_CRIT_SECT( *wxHandlersWithPendingEventsLocker );

 
 

-    if (wxPendingEvents)
+    if (wxHandlersWithPendingEvents)

     {
         // iterate until the list becomes empty: the handlers remove themselves
         // from it when they don't have any more pending events
     {
         // iterate until the list becomes empty: the handlers remove themselves
         // from it when they don't have any more pending events

-        wxList::compatibility_iterator node = wxPendingEvents->GetFirst();
+        wxList::compatibility_iterator node = wxHandlersWithPendingEvents->GetFirst();

         while (node)
         {
             // In ProcessPendingEvents(), new handlers might be add
             // and we can safely leave the critical section here.
         while (node)
         {
             // In ProcessPendingEvents(), new handlers might be add
             // and we can safely leave the critical section here.

-            wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+            wxLEAVE_CRIT_SECT( *wxHandlersWithPendingEventsLocker );

 
             wxEvtHandler *handler = (wxEvtHandler *)node->GetData();
             handler->ProcessPendingEvents();
 
 
             wxEvtHandler *handler = (wxEvtHandler *)node->GetData();
             handler->ProcessPendingEvents();
 

-            wxENTER_CRIT_SECT( *wxPendingEventsLocker );
+            wxENTER_CRIT_SECT( *wxHandlersWithPendingEventsLocker );

 
             // restart as the iterators could have been invalidated
 
             // restart as the iterators could have been invalidated

-            node = wxPendingEvents->GetFirst();
+            node = wxHandlersWithPendingEvents->GetFirst();

         }
     }
 
         }
     }
 

-    wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+    wxLEAVE_CRIT_SECT( *wxHandlersWithPendingEventsLocker );

 }
 
 void wxAppConsoleBase::WakeUpIdle()
 }
 
 void wxAppConsoleBase::WakeUpIdle()

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 590c3adf3e0939eee70349257d7f743f21b964f2..3a32fb3719b469737b53c2f031a0f517820cba0d 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -145,11 +145,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxEventTableEntryModule, wxModule)
 
 // List containing event handlers with pending events (each handler can occur
 // at most once here)
 
 // List containing event handlers with pending events (each handler can occur
 // at most once here)

-wxList *wxPendingEvents = NULL;
+wxList *wxHandlersWithPendingEvents = NULL;

 
 #if wxUSE_THREADS
 
 #if wxUSE_THREADS

-    // protects wxPendingEvents list
-    wxCriticalSection *wxPendingEventsLocker = NULL;
+    // protects wxHandlersWithPendingEvents list
+    wxCriticalSection *wxHandlersWithPendingEventsLocker = NULL;

 #endif
 
 // common event types are defined here, other event types are defined by the
 #endif
 
 // common event types are defined here, other event types are defined by the


@@ -1089,25 +1089,25 @@ wxEvtHandler::~wxEvtHandler()
         m_pendingEvents->DeleteContents(true);
     delete m_pendingEvents;
 
         m_pendingEvents->DeleteContents(true);
     delete m_pendingEvents;
 

-    // Remove us from wxPendingEvents if necessary.
-    if ( wxPendingEvents )
+    // Remove us from wxHandlersWithPendingEvents if necessary.
+    if ( wxHandlersWithPendingEvents )

     {
 #if wxUSE_THREADS
     {
 #if wxUSE_THREADS

-        if (wxPendingEventsLocker)
-            wxENTER_CRIT_SECT(*wxPendingEventsLocker);
+        if (wxHandlersWithPendingEventsLocker)
+            wxENTER_CRIT_SECT(*wxHandlersWithPendingEventsLocker);

 #endif
 
 #endif
 

-        if ( wxPendingEvents->DeleteObject(this) )
+        if ( wxHandlersWithPendingEvents->DeleteObject(this) )

         {
             // check that we were present only once in the list
         {
             // check that we were present only once in the list

-            wxASSERT_MSG( !wxPendingEvents->Find(this),
-                          "Handler occurs twice in wxPendingEvents list" );
+            wxASSERT_MSG( !wxHandlersWithPendingEvents->Find(this),
+                          "Handler occurs twice in wxHandlersWithPendingEvents list" );

         }
         //else: we weren't in this list at all, it's ok
 
 #if wxUSE_THREADS
         }
         //else: we weren't in this list at all, it's ok
 
 #if wxUSE_THREADS

-        if (wxPendingEventsLocker)
-            wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
+        if (wxHandlersWithPendingEventsLocker)
+            wxLEAVE_CRIT_SECT(*wxHandlersWithPendingEventsLocker);

 #endif
     }
 
 #endif
     }
 


@@ -1146,19 +1146,19 @@ void wxEvtHandler::QueueEvent(wxEvent *event)
     // 2) Add this event handler to list of event handlers that
     //    have pending events.
 
     // 2) Add this event handler to list of event handlers that
     //    have pending events.
 

-    wxENTER_CRIT_SECT(*wxPendingEventsLocker);
+    wxENTER_CRIT_SECT(*wxHandlersWithPendingEventsLocker);

 
 

-    if ( !wxPendingEvents )
-        wxPendingEvents = new wxList;
-    if ( !wxPendingEvents->Find(this) )
-        wxPendingEvents->Append(this);
+    if ( !wxHandlersWithPendingEvents )
+        wxHandlersWithPendingEvents = new wxList;
+    if ( !wxHandlersWithPendingEvents->Find(this) )
+        wxHandlersWithPendingEvents->Append(this);

 
 

-    wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
+    wxLEAVE_CRIT_SECT(*wxHandlersWithPendingEventsLocker);

 
     // only release m_pendingEventsLock now because otherwise there is a race
     // condition as described in the ticket #9093: we could process the event
     // just added to m_pendingEvents in our ProcessPendingEvents() below before
 
     // only release m_pendingEventsLock now because otherwise there is a race
     // condition as described in the ticket #9093: we could process the event
     // just added to m_pendingEvents in our ProcessPendingEvents() below before

-    // we had time to append this pointer to wxPendingEvents list; thus
+    // we had time to append this pointer to wxHandlersWithPendingEvents list; thus

     // breaking the invariant that a handler should be in the list iff it has
     // any pending events to process
     wxLEAVE_CRIT_SECT( m_pendingEventsLock );
     // breaking the invariant that a handler should be in the list iff it has
     // any pending events to process
     wxLEAVE_CRIT_SECT( m_pendingEventsLock );


@@ -1190,13 +1190,13 @@ void wxEvtHandler::ProcessPendingEvents()
     if ( m_pendingEvents->IsEmpty() )
     {
 #if wxUSE_THREADS
     if ( m_pendingEvents->IsEmpty() )
     {
 #if wxUSE_THREADS

-        if (wxPendingEventsLocker)
-            wxENTER_CRIT_SECT(*wxPendingEventsLocker);
+        if (wxHandlersWithPendingEventsLocker)
+            wxENTER_CRIT_SECT(*wxHandlersWithPendingEventsLocker);

 #endif
 #endif

-        wxPendingEvents->DeleteObject(this);
+        wxHandlersWithPendingEvents->DeleteObject(this);

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-        if (wxPendingEventsLocker)
-            wxLEAVE_CRIT_SECT(*wxPendingEventsLocker);
+        if (wxHandlersWithPendingEventsLocker)
+            wxLEAVE_CRIT_SECT(*wxHandlersWithPendingEventsLocker);

 #endif
     }
 
 #endif
     }