// 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"
+#include "wx/hashmap.h"
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
#include <Xm/Xm.h>
+#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)
timer->Notify();
}
-wxTimer::wxTimer()
+void wxTimer::Init()
{
m_id = 0;
+ m_milli = 1000;
}
wxTimer::~wxTimer()
{
- wxTimer::Stop();
- wxTimerList.DeleteObject(this);
+ Stop();
+ s_timers.erase(this);
}
bool wxTimer::Start(int milliseconds, bool mode)
(void)wxTimerBase::Start(milliseconds, mode);
- if (!wxTimerList.Find((long)this))
- wxTimerList.Append((long)this, this);
+ if (s_timers.find(this) == s_timers.end())
+ s_timers[this] = this;
m_id = XtAppAddTimeOut((XtAppContext) wxTheApp->GetAppContext(),
m_milli,
(XtTimerCallbackProc) wxTimerCallback,
(XtPointer) this);
- return TRUE;
+ return true;
}
void wxTimer::Stop()