fix another memory leak in SetCommand() (coverity checker CID 52)

[wxWidgets.git] / src / motif / timer.cpp

diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp
index 64f94518a66c9cc92848ee5f4c470fd162755643..edf7f20a5e1d9d15d2d5c66002ad17ea88d3ddd4 100644 (file)
--- a/src/motif/timer.cpp
+++ b/src/motif/timer.cpp
@@ -9,13 +9,12 @@
 // 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/timer.h"
 #include "wx/app.h"

-#include "wx/list.h"
+#include "wx/hashmap.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -27,16 +26,16 @@
 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
-#endif
+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
 
 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;
 
   if (timer->m_id == 0)


@@ -53,15 +52,16 @@ void wxTimerCallback (wxTimer * timer)
   timer->Notify();
 }
 
   timer->Notify();
 }
 

-wxTimer::wxTimer()
+void wxTimer::Init()

 {
     m_id = 0;
 {
     m_id = 0;

+    m_milli = 1000;

 }
 
 wxTimer::~wxTimer()
 {
 }
 
 wxTimer::~wxTimer()
 {

-    wxTimer::Stop();
-    wxTimerList.DeleteObject(this);
+    Stop();
+    s_timers.erase(this);

 }
 
 bool wxTimer::Start(int milliseconds, bool mode)
 }
 
 bool wxTimer::Start(int milliseconds, bool mode)


@@ -70,14 +70,14 @@ bool wxTimer::Start(int milliseconds, bool mode)
 
     (void)wxTimerBase::Start(milliseconds, 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);
 
     m_id = XtAppAddTimeOut((XtAppContext) wxTheApp->GetAppContext(),
                             m_milli,
                             (XtTimerCallbackProc) wxTimerCallback,
                             (XtPointer) this);

-    return TRUE;
+    return true;

 }
 
 void wxTimer::Stop()
 }
 
 void wxTimer::Stop()