fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 5a741b70ac439b3c2148aafe03a821f4aa963536..81dacee807aaf6c9d0190062ffc6762b9425cfbc 100644 (file)
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -42,7 +42,7 @@
 #include "wx/evtloop.h"
 #include "wx/filename.h"
 #include "wx/msgout.h"
 #include "wx/evtloop.h"
 #include "wx/filename.h"
 #include "wx/msgout.h"

-#include "wx/ptr_scpd.h"
+#include "wx/scopedptr.h"

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


@@ -153,7 +153,7 @@ wxAppConsoleBase::~wxAppConsoleBase()
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// initilization/cleanup
+// initialization/cleanup

 // ----------------------------------------------------------------------------
 
 bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **argv)
 // ----------------------------------------------------------------------------
 
 bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **argv)


@@ -162,10 +162,6 @@ bool wxAppConsoleBase::Initialize(int& WXUNUSED(argc), wxChar **argv)
     GetTraits()->SetLocale();
 #endif // wxUSE_INTL
 
     GetTraits()->SetLocale();
 #endif // wxUSE_INTL
 

-#if wxUSE_THREADS
-    wxPendingEventsLocker = new wxCriticalSection;
-#endif
-

 #ifndef __WXPALMOS__
     if ( m_appName.empty() && argv && argv[0] )
     {
 #ifndef __WXPALMOS__
     if ( m_appName.empty() && argv && argv[0] )
     {


@@ -189,14 +185,6 @@ void wxAppConsoleBase::CleanUp()
         delete m_mainLoop;
         m_mainLoop = NULL;
     }
         delete m_mainLoop;
         m_mainLoop = NULL;
     }

-
-    delete wxPendingEvents;
-    wxPendingEvents = NULL;
-
-#if wxUSE_THREADS
-    delete wxPendingEventsLocker;
-    wxPendingEventsLocker = NULL;
-#endif // wxUSE_THREADS

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -243,7 +231,7 @@ int wxAppConsoleBase::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)
 #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);
+    delete wxConfigBase::Set(NULL);

 #endif // wxUSE_CONFIG
 
     return 0;
 #endif // wxUSE_CONFIG
 
     return 0;


@@ -287,7 +275,7 @@ wxAppTraits *wxAppConsoleBase::GetTraitsIfExists()
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// event processing
+// wxEventLoop redirection

 // ----------------------------------------------------------------------------
 
 int wxAppConsoleBase::MainLoop()
 // ----------------------------------------------------------------------------
 
 int wxAppConsoleBase::MainLoop()


@@ -327,54 +315,37 @@ bool wxAppConsoleBase::Dispatch()
 
 bool wxAppConsoleBase::HasPendingEvents() const
 {
 
 bool wxAppConsoleBase::HasPendingEvents() const
 {

-    wxENTER_CRIT_SECT( *wxPendingEventsLocker );
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();

 
 

-    bool has = wxPendingEvents && !wxPendingEvents->IsEmpty();
+    return loop && loop->HasPendingEvents();
+}

 
 

-    wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+void wxAppConsoleBase::SuspendProcessingOfPendingEvents()
+{
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();

 
 

-    return has;
+    if (loop) loop->SuspendProcessingOfPendingEvents();

 }
 
 }
 

-/* static */
-bool wxAppConsoleBase::IsMainLoopRunning()
+void wxAppConsoleBase::ResumeProcessingOfPendingEvents()

 {
 {

-    const wxAppConsole * const app = GetInstance();
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();

 
 

-    return app && app->m_mainLoop != NULL;
+    if (loop) loop->ResumeProcessingOfPendingEvents();

 }
 
 void wxAppConsoleBase::ProcessPendingEvents()
 {
 }
 
 void wxAppConsoleBase::ProcessPendingEvents()
 {

-#if wxUSE_THREADS
-    if ( !wxPendingEventsLocker )
-        return;
-#endif
-
-    wxENTER_CRIT_SECT( *wxPendingEventsLocker );
-
-    if (wxPendingEvents)
-    {
-        // 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();
-        while (node)
-        {
-            // In ProcessPendingEvents(), new handlers might be add
-            // and we can safely leave the critical section here.
-            wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
-
-            wxEvtHandler *handler = (wxEvtHandler *)node->GetData();
-            handler->ProcessPendingEvents();
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();

 
 

-            wxENTER_CRIT_SECT( *wxPendingEventsLocker );
+    if (loop) loop->ProcessPendingEvents();
+}

 
 

-            // restart as the iterators could have been invalidated
-            node = wxPendingEvents->GetFirst();
-        }
-    }
+bool wxAppConsoleBase::Yield(bool onlyIfNeeded)
+{
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();

 
 

-    wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+    return loop && loop->Yield(onlyIfNeeded);

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


@@ -385,11 +356,21 @@ void wxAppConsoleBase::WakeUpIdle()
 
 bool wxAppConsoleBase::ProcessIdle()
 {
 
 bool wxAppConsoleBase::ProcessIdle()
 {

-    wxIdleEvent event;
+    wxEventLoopBase * const loop = wxEventLoopBase::GetActive();

 
 

-    event.SetEventObject(this);
-    ProcessEvent(event);
-    return event.MoreRequested();
+    return loop && loop->ProcessIdle();
+}
+
+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+/* static */
+bool wxAppConsoleBase::IsMainLoopRunning()
+{
+    const wxAppConsole * const app = GetInstance();
+
+    return app && app->m_mainLoop != NULL;

 }
 
 int wxAppConsoleBase::FilterEvent(wxEvent& WXUNUSED(event))
 }
 
 int wxAppConsoleBase::FilterEvent(wxEvent& WXUNUSED(event))


@@ -413,6 +394,20 @@ wxAppConsoleBase::HandleEvent(wxEvtHandler *handler,
     (handler->*func)(event);
 }
 
     (handler->*func)(event);
 }
 

+void wxAppConsoleBase::CallEventHandler(wxEvtHandler *handler,
+                                        wxEventFunctor& functor,
+                                        wxEvent& event) const
+{
+    // If the functor holds a method then, for backward compatibility, call
+    // HandleEvent():
+    wxEventFunction eventFunction = functor.GetMethod();
+
+    if ( eventFunction )
+        HandleEvent(handler, eventFunction, event);
+    else
+        functor(handler, event);
+}
+

 void wxAppConsoleBase::OnUnhandledException()
 {
 #ifdef __WXDEBUG__
 void wxAppConsoleBase::OnUnhandledException()
 {
 #ifdef __WXDEBUG__


@@ -555,7 +550,6 @@ bool wxAppConsoleBase::CheckBuildOptions(const char *optionsSignature,
         // normally wxLogFatalError doesn't return
         return false;
     }
         // normally wxLogFatalError doesn't return
         return false;
     }

-#undef wxCMP

 
     return true;
 }
 
     return true;
 }