correct access for virtuals

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

diff --git a/include/wx/os2/timer.h b/include/wx/os2/timer.h
index 975e76499bd44776150c6a130a2553f3b1ecf674..90019563b3772a7c3eaed894135a9992300f3dc0 100644 (file)
--- a/include/wx/os2/timer.h
+++ b/include/wx/os2/timer.h
@@ -14,34 +14,44 @@
 
 #include "wx/object.h"
 
 
 #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* pOwner
+            ,int           nId = -1
+           )
+           : wxTimerBase( pOwner
+                         ,nId
+                        )
+        { Init(); }

     ~wxTimer();
 
     ~wxTimer();
 

-    virtual bool Start(int milliseconds = -1,
-                       bool one_shot = FALSE); // Start timer
-    virtual void Stop();                       // Stop timer
+    virtual void Notify(void);
+    virtual bool Start( int  nMilliseconds = -1
+                       ,bool bOneShot = FALSE
+                      );
+    virtual void Stop(void);

 
 

-    virtual void Notify() = 0;                 // Override this member
-
-    // Returns the current interval time (0 if stop)
-    int Interval() const { return milli; };
-    bool OneShot() const { return oneShot; }
+    inline virtual bool IsRunning(void) const { return m_ulId != 0L; }
+    inline          int GetTimerId(void) const { return m_idTimer; }

 
 protected:
 
 protected:

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

 
 

-    long id;
+    ULONG                            m_ulId;
+    HAB                              m_Hab;

 
 private:
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 
 
 private:
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 

+extern ULONG wxTimerProc( HWND  WXUNUSED(hwnd)
+                         ,ULONG
+                         ,int   nIdTimer
+                         ,ULONG
+                        );

 #endif
     // _WX_TIMER_H_
 #endif
     // _WX_TIMER_H_