[ 1509599 ] 'Split pickers page in widgets sample' with more icons and rebaking.

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

diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp
index f4ef797df6d32f63d25d5aa59ff0f35092cc47bf..48677e8a1fcaedb052891ce22969620863b8060c 100644 (file)
--- a/src/motif/timer.cpp
+++ b/src/motif/timer.cpp
@@ -1,21 +1,23 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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/hashmap.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/hashmap.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -27,7 +29,7 @@
 
 #include "wx/motif/private.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject);
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
 WX_DECLARE_VOIDPTR_HASH_MAP(wxTimer*, wxTimerHashMap);
 
@@ -40,7 +42,7 @@ void wxTimerCallback (wxTimer * timer)
     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(),
@@ -78,7 +80,7 @@ bool wxTimer::Start(int milliseconds, bool mode)
                             m_milli,
                             (XtTimerCallbackProc) wxTimerCallback,
                             (XtPointer) this);
-    return TRUE;
+    return true;
 }
 
 void wxTimer::Stop()
@@ -90,5 +92,3 @@ void wxTimer::Stop()
     }
     m_milli = 0 ;
 }
-
-