share wxEventLoop::IsRunning() implementation between all ports; moved wxEventLoopAct...

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

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index 2612ac024c9643a0c40ff0d9238e3f1891cebfd1..76319e3f1e0ebdd19a101ca7954565bb223de3b7 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -41,15 +41,18 @@ public:
     // dispatch a single event, return false if we should exit from the loop
     virtual bool Dispatch() = 0;
 
     // dispatch a single event, return false if we should exit from the loop
     virtual bool Dispatch() = 0;
 

-    // is the event loop running now?
-    virtual bool IsRunning() const = 0;
-

     // return currently active (running) event loop, may be NULL
     static wxEventLoop *GetActive() { return ms_activeLoop; }
 
     // set currently active (running) event loop
     static void SetActive(wxEventLoop* loop) { ms_activeLoop = loop; }
 
     // return currently active (running) event loop, may be NULL
     static wxEventLoop *GetActive() { return ms_activeLoop; }
 
     // set currently active (running) event loop
     static void SetActive(wxEventLoop* loop) { ms_activeLoop = loop; }
 

+    // is this event loop running now?
+    //
+    // notice that even if this event loop hasn't terminated yet but has just
+    // spawned a nested (e.g. modal) event loop, this would return false
+    bool IsRunning() const;
+

 protected:
     // this function should be called before the event loop terminates, whether
     // this happens normally (because of Exit() call) or abnormally (because of
 protected:
     // this function should be called before the event loop terminates, whether
     // this happens normally (because of Exit() call) or abnormally (because of


@@ -86,7 +89,6 @@ public:
     virtual void Exit(int rc = 0);
     virtual bool Pending() const;
     virtual bool Dispatch();
     virtual void Exit(int rc = 0);
     virtual bool Pending() const;
     virtual bool Dispatch();

-    virtual bool IsRunning() const { return GetActive() == this; }

 
 protected:
     // the pointer to the port specific implementation class
 
 protected:
     // the pointer to the port specific implementation class


@@ -97,6 +99,8 @@ protected:
 
 #endif // __WXMSW__/!__WXMSW__
 
 
 #endif // __WXMSW__/!__WXMSW__
 

+inline bool wxEventLoopBase::IsRunning() const { return GetActive() == this; }
+

 // ----------------------------------------------------------------------------
 // wxModalEventLoop
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxModalEventLoop
 // ----------------------------------------------------------------------------


@@ -126,4 +130,30 @@ private:
     wxWindowDisabler *m_windowDisabler;
 };
 
     wxWindowDisabler *m_windowDisabler;
 };
 

+// ----------------------------------------------------------------------------
+// wxEventLoopActivator: helper class for wxEventLoop implementations
+// ----------------------------------------------------------------------------
+
+// this object sets the wxEventLoop given to the ctor as the currently active
+// one and unsets it in its dtor, this is especially useful in presence of
+// exceptions but is more tidy even when we don't use them
+class wxEventLoopActivator
+{
+public:
+    wxEventLoopActivator(wxEventLoop *evtLoop)
+    {
+        m_evtLoopOld = wxEventLoop::GetActive();
+        wxEventLoop::SetActive(evtLoop);
+    }
+
+    ~wxEventLoopActivator()
+    {
+        // restore the previously active event loop
+        wxEventLoop::SetActive(m_evtLoopOld);
+    }
+
+private:
+    wxEventLoop *m_evtLoopOld;
+};
+

 #endif // _WX_EVTLOOP_H_
 #endif // _WX_EVTLOOP_H_

diff --git a/include/wx/msw/evtloop.h b/include/wx/msw/evtloop.h
index a5c7720028aefcc2142558a48eece8c9e8568733..fe75758c14bd0975d04f3ba1a4a5785ff954dd63 100644 (file)
--- a/include/wx/msw/evtloop.h
+++ b/include/wx/msw/evtloop.h
@@ -26,7 +26,6 @@ public:
     virtual void Exit(int rc = 0);
     virtual bool Pending() const;
     virtual bool Dispatch();
     virtual void Exit(int rc = 0);
     virtual bool Pending() const;
     virtual bool Dispatch();

-    virtual bool IsRunning() const;

 
     // MSW-specific methods
     // --------------------
 
     // MSW-specific methods
     // --------------------

diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm
index 7e122cb12a02f0aa58a06afb60309dfa6a5868d5..4a3a94be67eb2bacb174204e1a1cfbaa4024f423 100644 (file)
--- a/src/cocoa/evtloop.mm
+++ b/src/cocoa/evtloop.mm
@@ -60,8 +60,7 @@ int wxEventLoop::Run()
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 

-    wxEventLoop *oldLoop = ms_activeLoop;
-    ms_activeLoop = this;
+    wxEventLoopActivator activate(this);

 
     m_impl = new wxEventLoopImpl;
 
 
     m_impl = new wxEventLoopImpl;
 


@@ -71,8 +70,6 @@ int wxEventLoop::Run()
     delete m_impl;
     m_impl = NULL;
 
     delete m_impl;
     m_impl = NULL;
 

-    ms_activeLoop = oldLoop;
-

     return exitcode;
 }
 
     return exitcode;
 }
 

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index 7fbde67a58653b85c47617ee576cf6cfbd370df8..7d9af25874b0ffc7d730034d6b1cf0ee2ebd72cb 100644 (file)
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -68,8 +68,7 @@ int wxEventLoop::Run()
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 

-    wxEventLoop *oldLoop = ms_activeLoop;
-    ms_activeLoop = this;
+    wxEventLoopActivator activate(this);

 
     m_impl = new wxEventLoopImpl;
 
 
     m_impl = new wxEventLoopImpl;
 


@@ -79,8 +78,6 @@ int wxEventLoop::Run()
     delete m_impl;
     m_impl = NULL;
 
     delete m_impl;
     m_impl = NULL;
 

-    ms_activeLoop = oldLoop;
-

     return exitcode;
 }
 
     return exitcode;
 }
 

diff --git a/src/gtk1/evtloop.cpp b/src/gtk1/evtloop.cpp
index 7fbde67a58653b85c47617ee576cf6cfbd370df8..7d9af25874b0ffc7d730034d6b1cf0ee2ebd72cb 100644 (file)
--- a/src/gtk1/evtloop.cpp
+++ b/src/gtk1/evtloop.cpp
@@ -68,8 +68,7 @@ int wxEventLoop::Run()
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 

-    wxEventLoop *oldLoop = ms_activeLoop;
-    ms_activeLoop = this;
+    wxEventLoopActivator activate(this);

 
     m_impl = new wxEventLoopImpl;
 
 
     m_impl = new wxEventLoopImpl;
 


@@ -79,8 +78,6 @@ int wxEventLoop::Run()
     delete m_impl;
     m_impl = NULL;
 
     delete m_impl;
     m_impl = NULL;
 

-    ms_activeLoop = oldLoop;
-

     return exitcode;
 }
 
     return exitcode;
 }
 

diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index 688430aee1c2991106401d9dd12661bd1092f8bf..10f6b5d12eb2cff4d0d4989daa98f731dd5b4f46 100644 (file)
--- a/src/mgl/evtloop.cpp
+++ b/src/mgl/evtloop.cpp
@@ -118,8 +118,7 @@ int wxEventLoop::Run()
 
     m_impl = new wxEventLoopImpl;
 
 
     m_impl = new wxEventLoopImpl;
 

-    wxEventLoop *oldLoop = ms_activeLoop;
-    ms_activeLoop = this;
+    wxEventLoopActivator activate(this);

 
     for ( ;; )
     {
 
     for ( ;; )
     {


@@ -144,8 +143,6 @@ int wxEventLoop::Run()
     delete m_impl;
     m_impl = NULL;
 
     delete m_impl;
     m_impl = NULL;
 

-    ms_activeLoop = oldLoop;
-

     return exitcode;
 }
 
     return exitcode;
 }
 

diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index 205496ca057d002ec9f4bf2a2da4f7d859c227a8..c8380862baac987c5243b22278b9dbdcb2234a15 100644 (file)
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -108,8 +108,7 @@ int wxEventLoop::Run()
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 

-    wxEventLoop *oldLoop = ms_activeLoop;
-    ms_activeLoop = this;
+    wxEventLoopActivator activate(this);

 
     m_impl = new wxEventLoopImpl;
     m_impl->SetKeepGoing( true );
 
     m_impl = new wxEventLoopImpl;
     m_impl->SetKeepGoing( true );


@@ -124,8 +123,6 @@ int wxEventLoop::Run()
     delete m_impl;
     m_impl = NULL;
 
     delete m_impl;
     m_impl = NULL;
 

-    ms_activeLoop = oldLoop;
-

     return exitcode;
 }
 
     return exitcode;
 }
 

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 252a3c8a841e9742e62955bafcedc6c483830639..2b6dd09984f2bc7a393067907d12f072b91465d0 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -48,34 +48,6 @@
     WX_DEFINE_LIST(wxMsgList)
 #endif // wxUSE_THREADS
 
     WX_DEFINE_LIST(wxMsgList)
 #endif // wxUSE_THREADS
 

-// ----------------------------------------------------------------------------
-// helper class
-// ----------------------------------------------------------------------------
-
-// this object sets the wxEventLoop given to the ctor as the currently active
-// one and unsets it in its dtor
-class wxEventLoopActivator
-{
-public:
-    wxEventLoopActivator(wxEventLoop **pActive,
-                         wxEventLoop *evtLoop)
-    {
-        m_pActive = pActive;
-        m_evtLoopOld = *pActive;
-        *pActive = evtLoop;
-    }
-
-    ~wxEventLoopActivator()
-    {
-        // restore the previously active event loop
-        *m_pActive = m_evtLoopOld;
-    }
-
-private:
-    wxEventLoop *m_evtLoopOld;
-    wxEventLoop **m_pActive;
-};
-

 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================
 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================


@@ -223,11 +195,6 @@ bool wxEventLoop::PreProcessMessage(WXMSG *msg)
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 

-bool wxEventLoop::IsRunning() const
-{
-    return ms_activeLoop == this;
-}
-

 int wxEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!
 int wxEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!


@@ -236,7 +203,7 @@ int wxEventLoop::Run()
     // ProcessIdle() and Dispatch() below may throw so the code here should
     // be exception-safe, hence we must use local objects for all actions we
     // should undo
     // ProcessIdle() and Dispatch() below may throw so the code here should
     // be exception-safe, hence we must use local objects for all actions we
     // should undo

-    wxEventLoopActivator activate(&ms_activeLoop, this);
+    wxEventLoopActivator activate(this);

 
     // we must ensure that OnExit() is called even if an exception is thrown
     // from inside Dispatch() but we must call it from Exit() in normal
 
     // we must ensure that OnExit() is called even if an exception is thrown
     // from inside Dispatch() but we must call it from Exit() in normal

diff --git a/src/os2/evtloop.cpp b/src/os2/evtloop.cpp
index 6d72bb674c1916e52fe09a9e353bb16561e9956f..08b13d53ded3d03523369fd7f964a48a814169c3 100644 (file)
--- a/src/os2/evtloop.cpp
+++ b/src/os2/evtloop.cpp
@@ -83,30 +83,6 @@ private:
 
 wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopImpl);
 
 
 wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopImpl);
 

-// this object sets the wxEventLoop given to the ctor as the currently active
-// one and unsets it in its dtor
-class wxEventLoopActivator
-{
-public:
-    wxEventLoopActivator(wxEventLoop **pActive,
-                         wxEventLoop *evtLoop)
-    {
-        m_pActive = pActive;
-        m_evtLoopOld = *pActive;
-        *pActive = evtLoop;
-    }
-
-    ~wxEventLoopActivator()
-    {
-        // restore the previously active event loop
-        *m_pActive = m_evtLoopOld;
-    }
-
-private:
-    wxEventLoop *m_evtLoopOld;
-    wxEventLoop **m_pActive;
-};
-

 // ============================================================================
 // wxEventLoopImpl implementation
 // ============================================================================
 // ============================================================================
 // wxEventLoopImpl implementation
 // ============================================================================


@@ -271,7 +247,7 @@ int wxEventLoop::Run()
     // SendIdleMessage() and Dispatch() below may throw so the code here should
     // be exception-safe, hence we must use local objects for all actions we
     // should undo
     // SendIdleMessage() and Dispatch() below may throw so the code here should
     // be exception-safe, hence we must use local objects for all actions we
     // should undo

-    wxEventLoopActivator activate(&ms_activeLoop, this);
+    wxEventLoopActivator activate(this);

     wxEventLoopImplTiedPtr impl(&m_impl, new wxEventLoopImpl);
 
     CallEventLoopMethod  callOnExit(this, &wxEventLoop::OnExit);
     wxEventLoopImplTiedPtr impl(&m_impl, new wxEventLoopImpl);
 
     CallEventLoopMethod  callOnExit(this, &wxEventLoop::OnExit);

diff --git a/src/palmos/evtloop.cpp b/src/palmos/evtloop.cpp
index 3de13673dc5898884774af3c27b79b1b155fd45e..51dce71214fc767e5d4b5b9942ef9ef8aa30bd65 100644 (file)
--- a/src/palmos/evtloop.cpp
+++ b/src/palmos/evtloop.cpp
@@ -51,34 +51,6 @@
 #include <Menu.h>
 #include <Form.h>
 
 #include <Menu.h>
 #include <Form.h>
 

-// ----------------------------------------------------------------------------
-// helper class
-// ----------------------------------------------------------------------------
-
-// this object sets the wxEventLoop given to the ctor as the currently active
-// one and unsets it in its dtor
-class wxEventLoopActivator
-{
-public:
-    wxEventLoopActivator(wxEventLoop **pActive,
-                         wxEventLoop *evtLoop)
-    {
-        m_pActive = pActive;
-        m_evtLoopOld = *pActive;
-        *pActive = evtLoop;
-    }
-
-    ~wxEventLoopActivator()
-    {
-        // restore the previously active event loop
-        *m_pActive = m_evtLoopOld;
-    }
-
-private:
-    wxEventLoop *m_evtLoopOld;
-    wxEventLoop **m_pActive;
-};
-

 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================
 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================


@@ -122,6 +94,8 @@ int wxEventLoop::Run()
     status_t    error;
     EventType    event;
 
     status_t    error;
     EventType    event;
 

+    wxEventLoopActivator activate(this);
+

     do {
         wxTheApp && wxTheApp->ProcessIdle();
 
     do {
         wxTheApp && wxTheApp->ProcessIdle();
 

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index 5167c4b918dae11223c47885898bfd2a8d62769e..b44f46e8de5c8ad577cdeed722fdb56e5046200e 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -357,8 +357,7 @@ int wxEventLoop::Run()
 
     m_impl = new wxEventLoopImpl;
 
 
     m_impl = new wxEventLoopImpl;
 

-    wxEventLoop *oldLoop = ms_activeLoop;
-    ms_activeLoop = this;
+    wxEventLoopActivator activate(this);

 
     m_impl->m_keepGoing = TRUE;
     while ( m_impl->m_keepGoing )
 
     m_impl->m_keepGoing = TRUE;
     while ( m_impl->m_keepGoing )


@@ -400,8 +399,6 @@ int wxEventLoop::Run()
     delete m_impl;
     m_impl = NULL;
 
     delete m_impl;
     m_impl = NULL;
 

-    ms_activeLoop = oldLoop;
-

     return exitcode;
 }
 
     return exitcode;
 }