X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d57be459406c2830f6abc9d99ae99166c6d133b..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/motif/timer.cpp diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp index 1bf9297621..48677e8a1f 100644 --- a/src/motif/timer.cpp +++ b/src/motif/timer.cpp @@ -1,81 +1,86 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: timer.cpp +// Name: src/motif/timer.cpp // Purpose: wxTimer implementation // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "timer.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/timer.h" -#include "wx/app.h" -#include "wx/list.h" +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/hashmap.h" +#endif + +#ifdef __VMS__ +#pragma message disable nosimpint +#endif #include +#ifdef __VMS__ +#pragma message enable nosimpint +#endif #include "wx/motif/private.h" -#if !USE_SHARED_LIBRARY -IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) -#endif +IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler) + +WX_DECLARE_VOIDPTR_HASH_MAP(wxTimer*, wxTimerHashMap); -static wxList wxTimerList(wxKEY_INTEGER); +static wxTimerHashMap s_timers; void wxTimerCallback (wxTimer * timer) { // Check to see if it's still on - if (!wxTimerList.Find((long)timer)) + if (s_timers.find(timer) == s_timers.end()) return; if (timer->m_id == 0) - return; // Avoid to process spurious timer events + 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); + timer->m_id = XtAppAddTimeOut((XtAppContext) wxTheApp->GetAppContext(), + timer->m_milli, + (XtTimerCallbackProc) wxTimerCallback, + (XtPointer) timer); else timer->m_id = 0; - timer->Notify (); + + timer->Notify(); } -wxTimer::wxTimer() +void wxTimer::Init() { m_id = 0; - m_milli = 0 ; - m_id = 0; - m_oneShot = FALSE; + m_milli = 1000; } wxTimer::~wxTimer() { Stop(); + s_timers.erase(this); } bool wxTimer::Start(int milliseconds, bool mode) { Stop(); - m_oneShot = mode; - if (milliseconds < 0) - milliseconds = m_lastMilli; - - if (milliseconds <= 0) - return FALSE; + (void)wxTimerBase::Start(milliseconds, mode); - m_lastMilli = m_milli = milliseconds; + if (s_timers.find(this) == s_timers.end()) + s_timers[this] = this; - if (!wxTimerList.Find((long)this)) - wxTimerList.Append((long)this, this); - - m_id = XtAppAddTimeOut ((XtAppContext) wxTheApp->GetAppContext(), milliseconds, - (XtTimerCallbackProc) wxTimerCallback, (XtPointer) this); - return TRUE; + m_id = XtAppAddTimeOut((XtAppContext) wxTheApp->GetAppContext(), + m_milli, + (XtTimerCallbackProc) wxTimerCallback, + (XtPointer) this); + return true; } void wxTimer::Stop() @@ -87,5 +92,3 @@ void wxTimer::Stop() } m_milli = 0 ; } - -