removed mpthread and added thread.cpp and tglbutton.cpp

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

diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp
index 41e30b7ae33314b9c0c2605908c8efd75fbe4c7a..8fab6d35c1afa2d9a82485528d31ad4caeeee5fe 100644 (file)
--- a/src/motif/timer.cpp
+++ b/src/motif/timer.cpp
@@ -9,28 +9,37 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "timer.h"
 #endif
 
 #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
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 
 #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);
+
+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
 
 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)


@@ -47,15 +56,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)


@@ -64,8 +74,8 @@ 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,
 
     m_id = XtAppAddTimeOut((XtAppContext) wxTheApp->GetAppContext(),
                             m_milli,