X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d90895ac118ad4546eed7ee4c358a3fe644a1ad7..22385679c4c3ba8d836611a314e2e05710097cda:/include/wx/os2/timer.h diff --git a/include/wx/os2/timer.h b/include/wx/os2/timer.h index 975e76499b..b4f8a2fc51 100644 --- a/include/wx/os2/timer.h +++ b/include/wx/os2/timer.h @@ -14,34 +14,42 @@ #include "wx/object.h" -class WXDLLEXPORT wxTimer: public wxObject +class WXDLLEXPORT wxTimer: public wxTimerBase { friend void wxProcessTimer(wxTimer& timer); public: - wxTimer(); + wxTimer() { Init(); } + wxTimer( wxEvtHandler* pOwner + ,int nId = -1 + ) + : wxTimerBase( pOwner + ,nId + ) + { Init(); } ~wxTimer(); - virtual bool Start(int milliseconds = -1, - bool one_shot = FALSE); // Start timer - virtual void Stop(); // Stop timer + 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; } protected: - bool oneShot ; - int milli ; - int lastMilli ; + void Init(void); - long id; + ULONG m_ulId; + HAB m_Hab; private: DECLARE_ABSTRACT_CLASS(wxTimer) }; +extern ULONG wxTimerProc( HWND WXUNUSED(hwnd) + ,ULONG + ,int nIdTimer + ,ULONG + ); #endif // _WX_TIMER_H_