fix building with WXWIN_COMPATIBILITY_2_8 == 0

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

diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp
index b6e108dee0925f03da75b014c77b97d635fdef42..c513dae2d4defa2a304fd2abc396c18fde51a62a 100644 (file)
--- a/src/motif/timer.cpp
+++ b/src/motif/timer.cpp
@@ -1,20 +1,22 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/timer.h"
-#include "wx/app.h"
-#include "wx/hashmap.h"
+#include "wx/motif/private/timer.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/hashmap.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -26,68 +28,66 @@
 
 #include "wx/motif/private.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler);
-
-WX_DECLARE_VOIDPTR_HASH_MAP(wxTimer*, wxTimerHashMap);
+WX_DECLARE_VOIDPTR_HASH_MAP(wxMotifTimerImpl*, wxTimerHashMap);
 
-static wxTimerHashMap s_timers;
+static wxTimerHashMap gs_timers;
 
-void wxTimerCallback (wxTimer * timer)
+void wxTimerCallback (wxMotifTimerImpl *timer)
 {
-  // Check to see if it's still on
-  if (s_timers.find(timer) == s_timers.end())
-    return;
-
-  if (timer->m_id == 0)
-    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);
-  else
-    timer->m_id = 0;
-
-  timer->Notify();
+    // Check to see if it's still on
+    if ( gs_timers.find(timer) == gs_timers.end() )
+        return;
+
+    if ( !timer->IsRunning() )
+        return;            // Avoid to process spurious timer events
+
+    timer->Notify();
 }
 
-void wxTimer::Init()
+wxMotifTimerImpl::~wxMotifTimerImpl()
 {
-    m_id = 0;
-    m_milli = 1000;
+    gs_timers.erase(this);
 }
 
-wxTimer::~wxTimer()
+void wxMotifTimerImpl::DoStart()
 {
-    Stop();
-    s_timers.erase(this);
+    m_id = XtAppAddTimeOut((XtAppContext) wxTheApp->GetAppContext(),
+                            m_milli,
+                            (XtTimerCallbackProc) wxTimerCallback,
+                            (XtPointer) this);
 }
 
-bool wxTimer::Start(int milliseconds, bool mode)
+bool wxMotifTimerImpl::Start(int milliseconds, bool mode)
 {
-    Stop();
+    if ( !wxTimerImpl::Start(milliseconds, mode) )
+        return false;
 
-    (void)wxTimerBase::Start(milliseconds, mode);
+    if ( gs_timers.find(this) == gs_timers.end() )
+        gs_timers[this] = this;
 
-    if (s_timers.find(this) == s_timers.end())
-        s_timers[this] = this;
+    DoStart();
 
-    m_id = XtAppAddTimeOut((XtAppContext) wxTheApp->GetAppContext(),
-                            m_milli,
-                            (XtTimerCallbackProc) wxTimerCallback,
-                            (XtPointer) this);
     return true;
 }
 
-void wxTimer::Stop()
+void wxMotifTimerImpl::Stop()
 {
-    if (m_id > 0)
+    XtRemoveTimeOut (m_id);
+    m_id = 0;
+}
+
+void wxMotifTimerImpl::Notify()
+{
+    if ( IsOneShot() )
     {
-        XtRemoveTimeOut (m_id);
+        // nothing to do, timeout is removed automatically by X
         m_id = 0;
     }
-    m_milli = 0 ;
-}
+    else // rearm the timer
+    {
+        DoStart();
+    }
 
+    wxTimerImpl::Notify();
+}