moved assertdlg_gtk.[ch] to GTK_LOWLEVEL_SRC/HDR to fix wxUniv/GTK build

[wxWidgets.git] / src / mgl / evtloop.cpp

diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index 5ae745deb87a54d2e57d2b313dbadb5114c30ca0..076009f6d45c49a58c773e8734076f33a56bb40c 100644 (file)
--- a/src/mgl/evtloop.cpp
+++ b/src/mgl/evtloop.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        mgl/evtloop.cpp
+// Name:        src/mgl/evtloop.cpp
 // Purpose:     implements wxEventLoop for MGL
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -22,10 +22,10 @@
     #include "wx/window.h"
     #include "wx/app.h"
     #include "wx/thread.h"
+    #include "wx/timer.h"
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
-#include "wx/timer.h"
 #include "wx/mgl/private.h"
 
 // ----------------------------------------------------------------------------
@@ -39,19 +39,19 @@ public:
     wxEventLoopImpl()
         {
             SetExitCode(0);
-            SetKeepLooping(TRUE);
+            SetKeepLooping(true);
         }
 
     // process an event
     void Dispatch();
 
-    // generate an idle event, return TRUE if more idle time requested
+    // generate an idle event, return true if more idle time requested
     bool SendIdleEvent();
 
     // set/get the exit code
     void SetExitCode(int exitcode) { m_exitcode = exitcode; }
     int GetExitCode() const { return m_exitcode; }
-    
+
     void SetKeepLooping(bool k) { m_keepLooping = k; }
     bool GetKeepLooping() const { return m_keepLooping; }
 
@@ -59,7 +59,7 @@ private:
 
     // the exit code of the event loop
     int m_exitcode;
-    // FALSE if the loop should end
+    // false if the loop should end
     bool m_keepLooping;
 };
 
@@ -87,7 +87,7 @@ void wxEventLoopImpl::Dispatch()
         PM_sleep(10);
     }
     // end of EVT_halt
-    
+
     MGL_wmProcessEvent(g_winMng, &evt);
 }
 
@@ -104,8 +104,6 @@ bool wxEventLoopImpl::SendIdleEvent()
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
-wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
-
 wxEventLoop::~wxEventLoop()
 {
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
@@ -117,9 +115,8 @@ int wxEventLoop::Run()
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     m_impl = new wxEventLoopImpl;
-    
-    wxEventLoop *oldLoop = ms_activeLoop;
-    ms_activeLoop = this;
+
+    wxEventLoopActivator activate(this);
 
     for ( ;; )
     {
@@ -144,8 +141,6 @@ int wxEventLoop::Run()
     delete m_impl;
     m_impl = NULL;
 
-    ms_activeLoop = oldLoop;
-
     return exitcode;
 }
 
@@ -154,8 +149,8 @@ void wxEventLoop::Exit(int rc)
     wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
 
     m_impl->SetExitCode(rc);
-    m_impl->SetKeepLooping(FALSE);
-    
+    m_impl->SetKeepLooping(false);
+
     // Send a dummy event so that the app won't block in EVT_halt if there
     // are no user-generated events in the queue:
     EVT_post(0, EVT_USEREVT, 0, 0);
@@ -167,18 +162,18 @@ void wxEventLoop::Exit(int rc)
 
 bool wxEventLoop::Pending() const
 {
-    // update the display here, so that wxYield refreshes display and 
+    // update the display here, so that wxYield refreshes display and
     // changes take effect immediately, not after emptying events queue:
     MGL_wmUpdateDC(g_winMng);
-    
+
     // is there an event in the queue?
     event_t evt;
-    return EVT_peekNext(&evt, EVT_EVERYEVT);
+    return (bool)(EVT_peekNext(&evt, EVT_EVERYEVT));
 }
 
 bool wxEventLoop::Dispatch()
 {
-    wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") );
+    wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );
 
     m_impl->Dispatch();
     return m_impl->GetKeepLooping();