changes to match listctrl.h changes (forgot to commit yesterday, sorry)

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

diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index 7f3971cfe50d3f4668720c0a28ed0c7565f0d254..153f3b04004f15fdd9430d23bebb0c5f5aee3ccc 100644 (file)
--- a/src/mgl/evtloop.cpp
+++ b/src/mgl/evtloop.cpp
@@ -29,8 +29,9 @@
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
-
+#include "wx/timer.h"
 #include "wx/mgl/private.h"
+#include "pmapi.h"
 
 // ----------------------------------------------------------------------------
 // wxEventLoopImpl
@@ -75,9 +76,23 @@ 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);
+    for (;;)
+    {
+#if wxUSE_TIMER
+        wxTimer::NotifyTimers();
+        MGL_wmUpdateDC(g_winMng);
+#endif
+        EVT_pollJoystick();
+        if ( EVT_getNext(&evt, EVT_EVERYEVT) ) break;
+        PM_sleep(10);
+    }
+    // end of EVT_halt
     
-    EVT_halt(&evt, EVT_EVERYEVT);
     MGL_wmProcessEvent(g_winMng, &evt);
 }
 
@@ -152,6 +167,10 @@ void wxEventLoop::Exit(int rc)
 
     m_impl->SetExitCode(rc);
     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);
 }
 
 // ----------------------------------------------------------------------------