X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..1fe0a566bbf649efe7cadc21e8ded82458c8bdc6:/src/motif/timer.cpp

diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp
index fdc59712e6..3c930989aa 100644
--- a/src/motif/timer.cpp
+++ b/src/motif/timer.cpp
@@ -1,21 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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"
+#endif
+
+#include "wx/hashmap.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -27,18 +30,20 @@
 
 #include "wx/motif/private.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
-static wxList wxTimerList(wxKEY_INTEGER);
+WX_DECLARE_VOIDPTR_HASH_MAP(wxTimer*, wxTimerHashMap);
+
+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(),
@@ -59,8 +64,8 @@ void wxTimer::Init()
 
 wxTimer::~wxTimer()
 {
-    wxTimer::Stop();
-    wxTimerList.DeleteObject(this);
+    Stop();
+    s_timers.erase(this);
 }
 
 bool wxTimer::Start(int milliseconds, bool mode)
@@ -69,14 +74,14 @@ 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()
@@ -88,5 +93,3 @@ void wxTimer::Stop()
     }
     m_milli = 0 ;
 }
-
-