X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bb6408c2631988fab9925014c6619358bf867de..8b3fddc49326c0b6019cd7082218726aa17a5727:/src/motif/timer.cpp?ds=sidebyside diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp index bca8e00e0c..570e4186f9 100644 --- a/src/motif/timer.cpp +++ b/src/motif/timer.cpp @@ -14,38 +14,78 @@ #endif #include "wx/timer.h" +#include "wx/app.h" +#include "wx/list.h" -#if !USE_SHARED_LIBRARY -IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) +#ifdef __VMS__ +#pragma message disable nosimpint +#endif +#include +#ifdef __VMS__ +#pragma message enable nosimpint #endif -wxTimer::wxTimer() +#include "wx/motif/private.h" + +IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) + +static wxList wxTimerList(wxKEY_INTEGER); + +void wxTimerCallback (wxTimer * timer) +{ + // Check to see if it's still on + if (!wxTimerList.Find((long)timer)) + return; + + if (timer->m_id == 0) + return; // Avoid to process spurious timer events + + if (!timer->m_oneShot) + timer->m_id = XtAppAddTimeOut((XtAppContext) wxTheApp->GetAppContext(), + timer->m_milli, + (XtTimerCallbackProc) wxTimerCallback, + (XtPointer) timer); + else + timer->m_id = 0; + + timer->Notify(); +} + +void wxTimer::Init() { - m_milli = 0 ; m_id = 0; - m_oneShot = FALSE; + m_milli = 1000; } wxTimer::~wxTimer() { - Stop(); + wxTimer::Stop(); + wxTimerList.DeleteObject(this); } -bool wxTimer::Start(int milliseconds,bool mode) +bool wxTimer::Start(int milliseconds, bool mode) { - m_oneShot = mode ; - if (milliseconds <= 0) - return FALSE; + Stop(); + + (void)wxTimerBase::Start(milliseconds, mode); - m_milli = milliseconds; + if (!wxTimerList.Find((long)this)) + wxTimerList.Append((long)this, this); - // TODO: set the timer going. - return FALSE; + m_id = XtAppAddTimeOut((XtAppContext) wxTheApp->GetAppContext(), + m_milli, + (XtTimerCallbackProc) wxTimerCallback, + (XtPointer) this); + return TRUE; } void wxTimer::Stop() { - m_id = 0 ; + if (m_id > 0) + { + XtRemoveTimeOut (m_id); + m_id = 0; + } m_milli = 0 ; }