Removed unnecessary code from utilsunx.cpp

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

diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index 36fc33a1c0f339a7d834da456deb95838be1a9fe..104a7fffb083d74b680c1a40dbb5f722b6dd7d14 100644 (file)
--- a/include/wx/msw/timer.h
+++ b/include/wx/msw/timer.h
@@ -13,35 +13,28 @@
 #define _WX_TIMER_H_
 
 #ifdef __GNUG__
 #define _WX_TIMER_H_
 
 #ifdef __GNUG__

-#pragma interface "timer.h"
+    #pragma interface "timer.h"

 #endif
 
 #endif
 

-#include "wx/object.h"
-
-class WXDLLEXPORT wxTimer : public wxObject
+class WXDLLEXPORT wxTimer : public wxTimerBase

 {
 friend void wxProcessTimer(wxTimer& timer);
 
 public:
 {
 friend void wxProcessTimer(wxTimer& timer);
 
 public:

-    wxTimer();
+    wxTimer() { Init(); }
+    wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
+        { Init(); }

     ~wxTimer();
 
     ~wxTimer();
 

-    virtual bool Start(int milliseconds = -1,
-                       bool one_shot = FALSE); // Start timer
-    virtual void Stop();                       // Stop timer
-
-    virtual void Notify() = 0;                 // Override this member
+    virtual bool Start(int milliseconds = -1, bool oneShot = FALSE);
+    virtual void Stop();

 
 

-    // Returns the current interval time (0 if stop)
-    int Interval() const { return milli; };
-    bool OneShot() const { return oneShot; }
+    virtual bool IsRunning() const { return m_id != 0; }

 
 protected:
 
 protected:

-    bool oneShot;
-    int  milli;
-    int  lastMilli;
+    void Init();

 
 

-    long id;
+    long m_id;

 
 private:
     DECLARE_ABSTRACT_CLASS(wxTimer)
 
 private:
     DECLARE_ABSTRACT_CLASS(wxTimer)