X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1acd70f921609754caa7f1a6cd9ade044b0b3c19..3e8adad7d79dff655b13952764ed603578edf0e9:/src/mgl/evtloop.cpp?ds=sidebyside

diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index e4b4f26373..5ae745deb8 100644
--- a/src/mgl/evtloop.cpp
+++ b/src/mgl/evtloop.cpp
@@ -3,18 +3,14 @@
 // 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"
 
@@ -31,7 +27,6 @@
 #include "wx/evtloop.h"
 #include "wx/timer.h"
 #include "wx/mgl/private.h"
-#include "pmapi.h"
 
 // ----------------------------------------------------------------------------
 // wxEventLoopImpl
@@ -76,22 +71,21 @@ void wxEventLoopImpl::Dispatch()
 {
     event_t evt;
 
-    MGL_wmUpdateDC(g_winMng);
-    
     // VS: The code bellow is equal to MGL's EVT_halt implementation, with
     //     two things added: sleeping (busy waiting is stupid, lets make CPU's
     //     life a bit easier) and timers updating
 
     // EVT_halt(&evt, EVT_EVERYEVT);
-    do 
+    for (;;)
     {
-        EVT_pollJoystick();
-        EVT_getNext(&evt, EVT_EVERYEVT);
 #if wxUSE_TIMER
         wxTimer::NotifyTimers();
+        MGL_wmUpdateDC(g_winMng);
 #endif
+        EVT_pollJoystick();
+        if ( EVT_getNext(&evt, EVT_EVERYEVT) ) break;
         PM_sleep(10);
-    } while (!(evt.what & EVT_EVERYEVT));
+    }
     // end of EVT_halt
     
     MGL_wmProcessEvent(g_winMng, &evt);
@@ -99,9 +93,7 @@ void wxEventLoopImpl::Dispatch()
 
 bool wxEventLoopImpl::SendIdleEvent()
 {
-    wxIdleEvent event;
-
-    return wxTheApp->ProcessEvent(event) && event.MoreRequested();
+    return wxTheApp->ProcessIdle();
 }
 
 // ============================================================================
@@ -112,18 +104,13 @@ bool wxEventLoopImpl::SendIdleEvent()
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
-wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
+wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
 
 wxEventLoop::~wxEventLoop()
 {
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 }
 
-bool wxEventLoop::IsRunning() const
-{
-    return m_impl != NULL;
-}
-
 int wxEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!
@@ -180,6 +167,11 @@ void wxEventLoop::Exit(int rc)
 
 bool wxEventLoop::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);
 }