Avoid outputting the assert message twice in non-GUI code.

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

diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index 8135bf6a5d68296e578c7a865f924756aa976351..861fc560149324fda9f0f2fccfd8809769af5af1 100644 (file)
--- a/src/mgl/evtloop.cpp
+++ b/src/mgl/evtloop.cpp
@@ -26,6 +26,8 @@
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"
 #endif //WX_PRECOMP
 
 #include "wx/evtloop.h"

+
+#include "wx/generic/private/timer.h"

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


@@ -79,9 +81,10 @@ void wxEventLoopImpl::Dispatch()
     for (;;)
     {
 #if wxUSE_TIMER
     for (;;)
     {
 #if wxUSE_TIMER

-        wxTimer::NotifyTimers();
-        MGL_wmUpdateDC(g_winMng);
+        wxGenericTimerImpl::NotifyTimers();

 #endif
 #endif

+        MGL_wmUpdateDC(g_winMng);
+

         EVT_pollJoystick();
         if ( EVT_getNext(&evt, EVT_EVERYEVT) ) break;
         PM_sleep(10);
         EVT_pollJoystick();
         if ( EVT_getNext(&evt, EVT_EVERYEVT) ) break;
         PM_sleep(10);


@@ -97,22 +100,22 @@ bool wxEventLoopImpl::SendIdleEvent()
 }
 
 // ============================================================================
 }
 
 // ============================================================================

-// wxEventLoop implementation
+// wxGUIEventLoop implementation

 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// wxEventLoop running and exiting
+// wxGUIEventLoop running and exiting

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-wxEventLoop::~wxEventLoop()
+wxGUIEventLoop::~wxGUIEventLoop()

 {
 {

-    wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
+    wxASSERT_MSG( !m_impl, wxT("should have been deleted in Run()") );

 }
 
 }
 

-int wxEventLoop::Run()
+int wxGUIEventLoop::Run()

 {
     // event loops are not recursive, you need to create another loop!
 {
     // event loops are not recursive, you need to create another loop!

-    wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
+    wxCHECK_MSG( !IsRunning(), -1, wxT("can't reenter a message loop") );

 
     m_impl = new wxEventLoopImpl;
 
 
     m_impl = new wxEventLoopImpl;
 


@@ -146,9 +149,9 @@ int wxEventLoop::Run()
     return exitcode;
 }
 
     return exitcode;
 }
 

-void wxEventLoop::Exit(int rc)
+void wxGUIEventLoop::Exit(int rc)

 {
 {

-    wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
+    wxCHECK_RET( IsRunning(), wxT("can't call Exit() if not running") );

 
     m_impl->SetExitCode(rc);
     m_impl->SetKeepLooping(false);
 
     m_impl->SetExitCode(rc);
     m_impl->SetKeepLooping(false);


@@ -162,7 +165,7 @@ void wxEventLoop::Exit(int rc)
 // wxEventLoop message processing dispatching
 // ----------------------------------------------------------------------------
 
 // wxEventLoop message processing dispatching
 // ----------------------------------------------------------------------------
 

-bool wxEventLoop::Pending() const
+bool wxGUIEventLoop::Pending() const

 {
     // update the display here, so that wxYield refreshes display and
     // changes take effect immediately, not after emptying events queue:
 {
     // update the display here, so that wxYield refreshes display and
     // changes take effect immediately, not after emptying events queue:


@@ -173,10 +176,47 @@ bool wxEventLoop::Pending() const
     return (bool)(EVT_peekNext(&evt, EVT_EVERYEVT));
 }
 
     return (bool)(EVT_peekNext(&evt, EVT_EVERYEVT));
 }
 

-bool wxEventLoop::Dispatch()
+bool wxGUIEventLoop::Dispatch()

 {
 {

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

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

+
+
+//-----------------------------------------------------------------------------
+// wxYield
+//-----------------------------------------------------------------------------
+
+bool wxGUIEventLoop::YieldFor(long eventsToProcess)
+{
+#if wxUSE_THREADS
+    if ( !wxThread::IsMain() )
+    {
+        // can't process events from other threads, MGL is thread-unsafe
+        return true;
+    }
+#endif // wxUSE_THREADS
+
+    m_isInsideYield = true;
+    m_eventsToProcessInsideYield = eventsToProcess;
+
+    wxLog::Suspend();
+
+    // TODO: implement event filtering using the eventsToProcess mask
+
+    while (Pending())
+        Dispatch();
+
+    /* it's necessary to call ProcessIdle() to update the frames sizes which
+       might have been changed (it also will update other things set from
+       OnUpdateUI() which is a nice (and desired) side effect) */
+    while (wxTheApp->ProcessIdle()) { }
+
+    wxLog::Resume();
+
+    m_isInsideYield = false;
+
+    return true;
+}