1. more HP-UX warning fixes (almost done...)

[wxWidgets.git] / include / wx / gtk1 / timer.h

diff --git a/include/wx/gtk1/timer.h b/include/wx/gtk1/timer.h
index ad3fbc619d3b06860e6c530cc8d31ce995095284..a565eefd3d46adf5507306b53417c960c7d57221 100644 (file)
--- a/include/wx/gtk1/timer.h
+++ b/include/wx/gtk1/timer.h
@@ -12,57 +12,26 @@
 #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();
 
-    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:
     int  m_tag;
-    int  m_time;
-    bool m_oneShot;
 
 private:
     DECLARE_ABSTRACT_CLASS(wxTimer)