compilation fix for !wxUSE_MENU_CALLBACK

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

diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index 1320d5e8c025b24621bf48c7d75099d412874857..308257acba781bfb7ff4b350c1470f329b8d15ce 100644 (file)
--- a/include/wx/msw/timer.h
+++ b/include/wx/msw/timer.h
@@ -6,19 +6,17 @@
 // 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_
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_
 #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);
 
 {
 friend void wxProcessTimer(wxTimer& timer);
 


@@ -26,22 +24,13 @@ public:
     wxTimer();
     ~wxTimer();
 
     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 ;
-
-    long id;
+    long m_id;

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