submenu preparation in two methods encapsulated

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

diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index e4b4f2637366bcc863f49132e6050e33acda43df..22f4d61355f71cea9d9dce471799c4caac190cd7 100644 (file)
--- a/src/mgl/evtloop.cpp
+++ b/src/mgl/evtloop.cpp
@@ -3,7 +3,7 @@
 // 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)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

 // License:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // License:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -31,7 +31,6 @@
 #include "wx/evtloop.h"
 #include "wx/timer.h"
 #include "wx/mgl/private.h"
 #include "wx/evtloop.h"
 #include "wx/timer.h"
 #include "wx/mgl/private.h"

-#include "pmapi.h"

 
 // ----------------------------------------------------------------------------
 // wxEventLoopImpl
 
 // ----------------------------------------------------------------------------
 // wxEventLoopImpl


@@ -76,22 +75,21 @@ void wxEventLoopImpl::Dispatch()
 {
     event_t evt;
 
 {
     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);
     // 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();
 #if wxUSE_TIMER
         wxTimer::NotifyTimers();

+        MGL_wmUpdateDC(g_winMng);

 #endif
 #endif

+        EVT_pollJoystick();
+        if ( EVT_getNext(&evt, EVT_EVERYEVT) ) break;

         PM_sleep(10);
         PM_sleep(10);

-    } while (!(evt.what & EVT_EVERYEVT));
+    }

     // end of EVT_halt
     
     MGL_wmProcessEvent(g_winMng, &evt);
     // end of EVT_halt
     
     MGL_wmProcessEvent(g_winMng, &evt);


@@ -180,6 +178,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);
 }