Explicit casting/instantiation to resolve ambiguous overload.

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

diff --git a/include/wx/gtk/timer.h b/include/wx/gtk/timer.h
index 821c03b30d6961c9aff00dd04392d102d30bee56..ad3fbc619d3b06860e6c530cc8d31ce995095284 100644 (file)
--- a/include/wx/gtk/timer.h
+++ b/include/wx/gtk/timer.h
@@ -2,9 +2,8 @@
 // Name:        timer.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -25,29 +24,48 @@
 
 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
 {
-  DECLARE_DYNAMIC_CLASS(wxTimer)
-
-  public:
-
-    wxTimer(void);
-    ~wxTimer(void);
-    int Interval(void);
-    bool OneShot(void);
-    virtual void Notify(void);
-    void Start( int millisecs = -1, bool oneShot = FALSE );
-    void Stop(void);
-    
-  private:
-  
+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
+
+protected:
     int  m_tag;
     int  m_time;
     bool m_oneShot;
+
+private:
+    DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 
 #endif // __GTKTIMERH__