Change wxGetCurrentUTime as wxGetCurrentMTime (milli not micro!)

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

diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index 42287be447cc1a645c50323944a37588b4a6c7f6..1320d5e8c025b24621bf48c7d75099d412874857 100644 (file)
--- a/include/wx/msw/timer.h
+++ b/include/wx/msw/timer.h
@@ -18,35 +18,34 @@
 
 #include "wx/object.h"
 
-class WXDLLEXPORT wxTimer: public wxObject
+class WXDLLEXPORT wxTimer : public wxObject
 {
-  DECLARE_DYNAMIC_CLASS(wxTimer)
-
- public:
-  bool oneShot ;
-  int  milli ;
-  int  lastMilli ;
-
-  long id;
- public:
-  wxTimer(void);
-  ~wxTimer(void);
-  virtual bool Start(int milliseconds = -1,bool one_shot = FALSE); // Start timer
-  virtual void Stop(void);                   // Stop timer
-  virtual void Notify(void) = 0;             // Override this member
-  inline int Interval(void) { return milli ; }; // Returns the current interval time (0 if stop)
-};
+friend void wxProcessTimer(wxTimer& timer);
+
+public:
+    wxTimer();
+    ~wxTimer();
+
+    virtual bool Start(int milliseconds = -1,
+                       bool one_shot = FALSE); // Start timer
+    virtual void Stop();                       // Stop timer
 
-// Timer functions (milliseconds)
-void WXDLLEXPORT wxStartTimer(void);
-// Gets time since last wxStartTimer or wxGetElapsedTime
-long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
+    virtual void Notify() = 0;                 // Override this member
 
-// EXPERIMENTAL: comment this out if it doesn't compile.
-bool WXDLLEXPORT wxGetLocalTime(long *timeZone, int *dstObserved);
+    // Returns the current interval time (0 if stop)
+    int Interval() const { return milli; };
+    bool OneShot() const { return oneShot; }
 
-// Get number of seconds since 00:00:00 GMT, Jan 1st 1970.
-long WXDLLEXPORT wxGetCurrentTime(void);
+protected:
+    bool oneShot ;
+    int  milli ;
+    int  lastMilli ;
+
+    long id;
+
+private:
+    DECLARE_ABSTRACT_CLASS(wxTimer)
+};
 
 #endif
     // _WX_TIMERH_