Fixed incorrect ratio initialization

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

diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index effad7cb10c1f9c31e5fe8e34e47a51c32c44828..d9fd9295661323fb7a21704876a1753e36cda149 100644 (file)
--- a/src/mgl/evtloop.cpp
+++ b/src/mgl/evtloop.cpp
@@ -3,15 +3,15 @@
 // Purpose:     implements wxEventLoop for MGL
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // 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
 // ----------------------------------------------------------------------------
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "evtloop.h"
 #endif
 
     #pragma implementation "evtloop.h"
 #endif
 


@@ -29,7 +29,7 @@
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"

-
+#include "wx/timer.h"

 #include "wx/mgl/private.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/mgl/private.h"
 
 // ----------------------------------------------------------------------------


@@ -74,19 +74,30 @@ private:
 void wxEventLoopImpl::Dispatch()
 {
     event_t evt;
 void wxEventLoopImpl::Dispatch()
 {
     event_t evt;

-    ibool rc;

 
 

-    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);
 }
 
 bool wxEventLoopImpl::SendIdleEvent()
 {
     MGL_wmProcessEvent(g_winMng, &evt);
 }
 
 bool wxEventLoopImpl::SendIdleEvent()
 {

-    wxIdleEvent event;
-
-    return wxTheApp->ProcessEvent(event) && event.MoreRequested();
+    return wxTheApp->ProcessIdle();

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -153,6 +164,10 @@ void wxEventLoop::Exit(int rc)
 
     m_impl->SetExitCode(rc);
     m_impl->SetKeepLooping(FALSE);
 
     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);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -161,6 +176,11 @@ void wxEventLoop::Exit(int rc)
 
 bool wxEventLoop::Pending() const
 {
 
 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);
 }
     event_t evt;
     return EVT_peekNext(&evt, EVT_EVERYEVT);
 }