X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88f2a7714a3a6d5b5da9494f3eede8b49f978cca..ac16633fdcfbd3f00d8bf1601a878819d6c20546:/src/mgl/evtloop.cpp?ds=sidebyside

diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index 153f3b0400..ff5d985cce 100644
--- a/src/mgl/evtloop.cpp
+++ b/src/mgl/evtloop.cpp
@@ -1,20 +1,16 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        mgl/evtloop.cpp
+// Name:        src/mgl/evtloop.cpp
 // Purpose:     implements wxEventLoop for MGL
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// License:     wxWindows license
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "evtloop.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -26,12 +22,13 @@
     #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/generic/private/timer.h"
 #include "wx/mgl/private.h"
-#include "pmapi.h"
 
 // ----------------------------------------------------------------------------
 // wxEventLoopImpl
@@ -44,19 +41,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; }
 
@@ -64,7 +61,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;
 };
 
@@ -84,54 +81,45 @@ void wxEventLoopImpl::Dispatch()
     for (;;)
     {
 #if wxUSE_TIMER
-        wxTimer::NotifyTimers();
-        MGL_wmUpdateDC(g_winMng);
+        wxGenericTimerImpl::NotifyTimers();
 #endif
+        MGL_wmUpdateDC(g_winMng);
+
         EVT_pollJoystick();
         if ( EVT_getNext(&evt, EVT_EVERYEVT) ) break;
         PM_sleep(10);
     }
     // end of EVT_halt
-    
+
     MGL_wmProcessEvent(g_winMng, &evt);
 }
 
 bool wxEventLoopImpl::SendIdleEvent()
 {
-    wxIdleEvent event;
-
-    return wxTheApp->ProcessEvent(event) && event.MoreRequested();
+    return wxTheApp->ProcessIdle();
 }
 
 // ============================================================================
-// wxEventLoop implementation
+// wxGUIEventLoop implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------
-// wxEventLoop running and exiting
+// wxGUIEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
-wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
-
-wxEventLoop::~wxEventLoop()
+wxGUIEventLoop::~wxGUIEventLoop()
 {
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 }
 
-bool wxEventLoop::IsRunning() const
-{
-    return m_impl != NULL;
-}
-
-int wxEventLoop::Run()
+int wxGUIEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!
     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 ( ;; )
     {
@@ -152,22 +140,22 @@ int wxEventLoop::Run()
         }
     }
 
+    OnExit();
+
     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;
 
-    ms_activeLoop = oldLoop;
-
     return exitcode;
 }
 
-void wxEventLoop::Exit(int rc)
+void wxGUIEventLoop::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);
@@ -177,16 +165,22 @@ void wxEventLoop::Exit(int rc)
 // wxEventLoop message processing dispatching
 // ----------------------------------------------------------------------------
 
-bool wxEventLoop::Pending() const
+bool wxGUIEventLoop::Pending() const
 {
+    // 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()
+bool wxGUIEventLoop::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();
 }
+