X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbe0af5b15f8b8e95ed45abc2140fb3a1fac3c87..59840ba3b16e4baf3228dd79c6b7ae40b55cf488:/include/wx/gtk/timer.h

diff --git a/include/wx/gtk/timer.h b/include/wx/gtk/timer.h
index ad3fbc619d..91fbc1002e 100644
--- a/include/wx/gtk/timer.h
+++ b/include/wx/gtk/timer.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.h
+// Name:        wx/gtk/timer.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -12,57 +12,30 @@
 #define __GTKTIMERH__
 
 #ifdef __GNUG__
-#pragma interface
+    #pragma interface "timer.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/object.h"
-
-//-----------------------------------------------------------------------------
-// derived classes
-//-----------------------------------------------------------------------------
-
-class wxTimer;
-
-//-----------------------------------------------------------------------------
-// global functions
-//-----------------------------------------------------------------------------
-
-/* Timer functions (milliseconds) */
-void wxStartTimer();
-
-/* Gets time since last wxStartTimer or wxGetElapsedTime */
-long wxGetElapsedTime(bool resetTimer = TRUE);
-
-/* EXPERIMENTAL: comment this out if it doesn't compile. */
-bool wxGetLocalTime(long *timeZone, int *dstObserved);
-
-/* Get number of seconds since 00:00:00 GMT, Jan 1st 1970. */
-long wxGetCurrentTime();
-
 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
 
-class wxTimer: public wxObject
+class wxTimer : public wxTimerBase
 {
 public:
-    wxTimer();
+    wxTimer() { Init(); }
+    wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
+        { Init(); }
     ~wxTimer();
 
-    int Interval() const { return m_time; }
-
-    bool OneShot() const { return m_oneShot; }
-
     virtual bool Start( int millisecs = -1, bool oneShot = FALSE );
     virtual void Stop();
 
-    virtual void Notify() = 0;  // override this
+    virtual bool IsRunning() const { return m_tag != -1; }
 
 protected:
+    void Init();
+
     int  m_tag;
-    int  m_time;
-    bool m_oneShot;
 
 private:
     DECLARE_ABSTRACT_CLASS(wxTimer)