X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eccd1992237c9b8bbe02a9eda66b709fd7ecea73..0c5405b727fc4a1ff66c1ded7e2a2da54d0d3718:/include/wx/msw/timer.h diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h index 7cca85b1fa..0607121c6c 100644 --- a/include/wx/msw/timer.h +++ b/include/wx/msw/timer.h @@ -12,21 +12,17 @@ #ifndef _WX_TIMER_H_ #define _WX_TIMER_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "timer.h" -#endif - class WXDLLEXPORT wxTimer : public wxTimerBase { friend void wxProcessTimer(wxTimer& timer); public: wxTimer() { Init(); } - wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) + wxTimer(wxEvtHandler *owner, int id = wxID_ANY) : wxTimerBase(owner, id) { Init(); } ~wxTimer(); - virtual bool Start(int milliseconds = -1, bool oneShot = FALSE); + virtual bool Start(int milliseconds = -1, bool oneShot = false); virtual void Stop(); virtual bool IsRunning() const { return m_id != 0; } @@ -34,8 +30,7 @@ public: protected: void Init(); - long m_id; - WXHWND m_hwnd; + unsigned long m_id; private: DECLARE_DYNAMIC_CLASS_NO_COPY(wxTimer)