some != NULL checks

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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 357f388c085c0a65b1f7699982ae9625bb1d20e3..18d3dcafff3abb6e72ccf80e3e324fe2501aa150 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -30,9 +30,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/list.h"

 #endif
 
 #include "wx/thread.h"
 #endif
 
 #include "wx/thread.h"

+#include "wx/confbase.h"

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -45,21 +47,40 @@
 void wxAppBase::ProcessPendingEvents()
 {
     // ensure that we're the only thread to modify the pending events list
 void wxAppBase::ProcessPendingEvents()
 {
     // ensure that we're the only thread to modify the pending events list

-    wxCRIT_SECT_LOCKER(locker, wxPendingEventsLocker);
+    wxENTER_CRIT_SECT( *wxPendingEventsLocker );

 
     if ( !wxPendingEvents )
 
     if ( !wxPendingEvents )

+    {
+        wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );

         return;
         return;

+    }

 
     // iterate until the list becomes empty
     wxNode *node = wxPendingEvents->First();
     while (node)
     {
         wxEvtHandler *handler = (wxEvtHandler *)node->Data();
 
     // iterate until the list becomes empty
     wxNode *node = wxPendingEvents->First();
     while (node)
     {
         wxEvtHandler *handler = (wxEvtHandler *)node->Data();

+        delete node;

 
 

+        // In ProcessPendingEvents(), new handlers might be add
+        // and we can safely leave the critical section here.
+        wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );

         handler->ProcessPendingEvents();
         handler->ProcessPendingEvents();

+        wxENTER_CRIT_SECT( *wxPendingEventsLocker );

 
 

-        delete node;

         node = wxPendingEvents->First();
     }
         node = wxPendingEvents->First();
     }

+
+    wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );

 }
 
 }
 

+int wxAppBase::OnExit()
+{
+#if wxUSE_CONFIG
+    // delete the config object if any (don't use Get() here, but Set()
+    // because Get() could create a new config object)
+    delete wxConfigBase::Set((wxConfigBase *) NULL);
+#endif // wxUSE_CONFIG
+
+    return 0;
+}