Fixed OS/2 compilation after wxDC changes

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

diff --git a/src/mgl/evtloop.cpp b/src/mgl/evtloop.cpp
index 58c868ada8974e59abb4a93050c5fe67721c6f39..ff5d985cceac03ccc4cc51bd84d362982585d3a9 100644 (file)
--- a/src/mgl/evtloop.cpp
+++ b/src/mgl/evtloop.cpp
@@ -22,10 +22,12 @@
     #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/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,19 +100,19 @@ 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, _T("should have been deleted in Run()") );
 }
 

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

 {
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 {
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );


@@ -137,6 +140,8 @@ int wxEventLoop::Run()
         }
     }
 
         }
     }
 

+    OnExit();
+

     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;
     int exitcode = m_impl->GetExitCode();
     delete m_impl;
     m_impl = NULL;


@@ -144,7 +149,7 @@ 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(), _T("can't call Exit() if not running") );
 


@@ -160,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:


@@ -171,10 +176,11 @@ 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") );
 
     m_impl->Dispatch();
     return m_impl->GetKeepLooping();
 }
 {
     wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );
 
     m_impl->Dispatch();
     return m_impl->GetKeepLooping();
 }

+