compilation fix after last change

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

diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index 42287be447cc1a645c50323944a37588b4a6c7f6..ad80f5080ce9408b444f7fce40d6efea4c53f067 100644 (file)
--- a/include/wx/msw/timer.h
+++ b/include/wx/msw/timer.h
@@ -6,47 +6,35 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 

-#ifdef __GNUG__
-#pragma interface "timer.h"
-#endif
+class WXDLLEXPORT wxTimer : public wxTimerBase
+{
+friend void wxProcessTimer(wxTimer& timer);

 
 

-#include "wx/object.h"
+public:
+    wxTimer() { Init(); }
+    wxTimer(wxEvtHandler *owner, int id = wxID_ANY) : wxTimerBase(owner, id)
+        { Init(); }
+    virtual ~wxTimer();

 
 

-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)
-};
+    virtual bool Start(int milliseconds = -1, bool oneShot = false);
+    virtual void Stop();
+
+    virtual bool IsRunning() const { return m_id != 0; }

 
 

-// Timer functions (milliseconds)
-void WXDLLEXPORT wxStartTimer(void);
-// Gets time since last wxStartTimer or wxGetElapsedTime
-long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
+protected:
+    void Init();

 
 

-// EXPERIMENTAL: comment this out if it doesn't compile.
-bool WXDLLEXPORT wxGetLocalTime(long *timeZone, int *dstObserved);
+    unsigned long m_id;

 
 

-// Get number of seconds since 00:00:00 GMT, Jan 1st 1970.
-long WXDLLEXPORT wxGetCurrentTime(void);
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTimer)
+};

 
 #endif
     // _WX_TIMERH_
 
 #endif
     // _WX_TIMERH_