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 e4b4f2637366bcc863f49132e6050e33acda43df..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$
 // 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__
-    #pragma implementation "evtloop.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -26,12 +22,11 @@
     #include "wx/window.h"
     #include "wx/app.h"
     #include "wx/thread.h"
     #include "wx/window.h"
     #include "wx/app.h"
     #include "wx/thread.h"

+    #include "wx/timer.h"

 #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"

-#include "pmapi.h"

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


@@ -44,19 +39,19 @@ public:
     wxEventLoopImpl()
         {
             SetExitCode(0);
     wxEventLoopImpl()
         {
             SetExitCode(0);

-            SetKeepLooping(TRUE);
+            SetKeepLooping(true);

         }
 
     // process an event
     void Dispatch();
 
         }
 
     // process an event
     void Dispatch();
 

-    // generate an idle event, return TRUE if more idle time requested
+    // 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; }
     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; }
 
     void SetKeepLooping(bool k) { m_keepLooping = k; }
     bool GetKeepLooping() const { return m_keepLooping; }
 


@@ -64,7 +59,7 @@ private:
 
     // the exit code of the event loop
     int m_exitcode;
 
     // 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;
 };
 
     bool m_keepLooping;
 };
 


@@ -76,32 +71,29 @@ 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
     // end of EVT_halt

-    
+

     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();

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


@@ -112,27 +104,19 @@ bool wxEventLoopImpl::SendIdleEvent()
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 

-wxEventLoop *wxEventLoop::ms_activeLoop = NULL;
-

 wxEventLoop::~wxEventLoop()
 {
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 }
 
 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!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     m_impl = new wxEventLoopImpl;
 int wxEventLoop::Run()
 {
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 
     m_impl = new wxEventLoopImpl;

-    
-    wxEventLoop *oldLoop = ms_activeLoop;
-    ms_activeLoop = this;
+
+    wxEventLoopActivator activate(this);

 
     for ( ;; )
     {
 
     for ( ;; )
     {


@@ -157,8 +141,6 @@ int wxEventLoop::Run()
     delete m_impl;
     m_impl = NULL;
 
     delete m_impl;
     m_impl = NULL;
 

-    ms_activeLoop = oldLoop;
-

     return exitcode;
 }
 
     return exitcode;
 }
 


@@ -167,8 +149,8 @@ void wxEventLoop::Exit(int rc)
     wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
 
     m_impl->SetExitCode(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);
     // 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);


@@ -180,13 +162,18 @@ 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;
     event_t evt;

-    return EVT_peekNext(&evt, EVT_EVERYEVT);
+    return (bool)(EVT_peekNext(&evt, EVT_EVERYEVT));

 }
 
 bool wxEventLoop::Dispatch()
 {
 }
 
 bool wxEventLoop::Dispatch()
 {

-    wxCHECK_MSG( IsRunning(), FALSE, _T("can't call Dispatch() if not running") );
+    wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );

 
     m_impl->Dispatch();
     return m_impl->GetKeepLooping();
 
     m_impl->Dispatch();
     return m_impl->GetKeepLooping();