compilation fix for !WX_PRECOMP (missing wx/app.h)

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

diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index 9f8161da68575029bc9c75f9fd4ba2131a550a0f..076009f6d45c49a58c773e8734076f33a56bb40c 100644 (file)
--- 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,10 +22,10 @@
     #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/mgl/private.h"
 
 // ----------------------------------------------------------------------------
@@ -43,19 +39,19 @@ public:
     wxEventLoopImpl()
         {
             SetExitCode(0);
-            SetKeepLooping(TRUE);
+            SetKeepLooping(true);
         }
 
-    // process a message
-    void ProcessEvent(event_t *evt);
+    // process an event
+    void Dispatch();
 
-    // generate an idle message, return TRUE if more idle time requested
-    bool SendIdleMessage();
+    // 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; }
 
@@ -63,7 +59,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;
 };
 
@@ -71,16 +67,33 @@ private:
 // wxEventLoopImpl implementation
 // ============================================================================
 
-void wxEventLoopImpl::ProcessEvent(event_t *evt)
+void wxEventLoopImpl::Dispatch()
 {
-    MGL_wmProcessEvent(g_winMng, evt);
+    event_t evt;
+
+    // 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
+
+    MGL_wmProcessEvent(g_winMng, &evt);
 }
 
-bool wxEventLoopImpl::SendIdleMessage()
+bool wxEventLoopImpl::SendIdleEvent()
 {
-    wxIdleEvent event;
-
-    return wxTheApp->ProcessEvent(event) && event.MoreRequested();
+    return wxTheApp->ProcessIdle();
 }
 
 // ============================================================================
@@ -96,11 +109,6 @@ 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!
@@ -108,6 +116,8 @@ int wxEventLoop::Run()
 
     m_impl = new wxEventLoopImpl;
 
+    wxEventLoopActivator activate(this);
+
     for ( ;; )
     {
 #if wxUSE_THREADS
@@ -116,7 +126,7 @@ int wxEventLoop::Run()
 
         // generate and process idle events for as long as we don't have
         // anything else to do
-        while ( !Pending() && m_impl->SendIdleMessage() ) {}
+        while ( !Pending() && m_impl->SendIdleEvent() ) {}
 
         // a message came or no more idle processing to do, sit in Dispatch()
         // waiting for the next message
@@ -139,7 +149,11 @@ void wxEventLoop::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);
 }
 
 // ----------------------------------------------------------------------------
@@ -148,29 +162,19 @@ 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);
+    return (bool)(EVT_peekNext(&evt, EVT_EVERYEVT));
 }
 
 bool wxEventLoop::Dispatch()
 {
-    wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") );
-
-    event_t evt;
-    ibool rc = EVT_getNext(&evt, EVT_EVERYEVT);
-
-    if ( !rc )
-    {
-        wxLogError(_T("events queue empty even though Pending() returned true"));
-        return FALSE;
-    }
-    
-    // FIXME_MGL -- there must be some way to programatically exit
-    // the loop, like WM_QUIT under Windows -- perhaps we need custom
-    // event to indicate this??
-
-    m_impl->ProcessEvent(&evt);
+    wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );
 
+    m_impl->Dispatch();
     return m_impl->GetKeepLooping();
 }
-