X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..c6e62f74fcac5b62889b59e7ce7a41d0ce884d7b:/src/msw/timer.cpp?ds=sidebyside diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index 119e7a0642..cd331eb4ec 100644 --- a/src/msw/timer.cpp +++ b/src/msw/timer.cpp @@ -20,27 +20,19 @@ #pragma hdrstop #endif -#include "wx/window.h" -#include "wx/msw/private.h" - #ifndef WX_PRECOMP #include "wx/setup.h" + #include "wx/window.h" #include "wx/list.h" #include "wx/event.h" #include "wx/app.h" + #include "wx/intl.h" + #include "wx/log.h" #endif -#include "wx/intl.h" -#include "wx/log.h" - #include "wx/timer.h" -#include -#include - -#if !defined(__SC__) && !defined(__GNUWIN32__) && !defined(__MWERKS__) - #include -#endif +#include "wx/msw/private.h" // ---------------------------------------------------------------------------- // private functions @@ -59,9 +51,7 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD); #define _EXPORT _export #endif -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) -#endif // ============================================================================ // implementation @@ -73,37 +63,31 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD); wxTimer::wxTimer() { - milli = 0; - lastMilli = -1; - id = 0; + m_id = 0; } wxTimer::~wxTimer() { - Stop(); + wxTimer::Stop(); wxTimerList.DeleteObject(this); } -bool wxTimer::Start(int milliseconds, bool mode) +bool wxTimer::Start(int milliseconds, bool oneShot) { - oneShot = mode; - if (milliseconds < 0) - milliseconds = lastMilli; + (void)wxTimerBase::Start(milliseconds, oneShot); - wxCHECK_MSG( milliseconds > 0, FALSE, wxT("invalid value for timer timeour") ); - - lastMilli = milli = milliseconds; + wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeour") ); wxTimerList.DeleteObject(this); TIMERPROC wxTimerProcInst = (TIMERPROC) MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance()); - id = SetTimer(NULL, (UINT)(id ? id : 1), - (UINT)milliseconds, wxTimerProcInst); - if (id > 0) + m_id = SetTimer(NULL, (UINT)(m_id ? m_id : 1), + (UINT)milliseconds, wxTimerProcInst); + if ( m_id > 0 ) { - wxTimerList.Append(id, this); + wxTimerList.Append(m_id, this); return TRUE; } @@ -117,13 +101,13 @@ bool wxTimer::Start(int milliseconds, bool mode) void wxTimer::Stop() { - if ( id ) + if ( m_id ) { - KillTimer(NULL, (UINT)id); + KillTimer(NULL, (UINT)m_id); wxTimerList.DeleteObject(this); } - id = 0; - milli = 0; + + m_id = 0; } // ---------------------------------------------------------------------------- @@ -133,10 +117,10 @@ void wxTimer::Stop() void wxProcessTimer(wxTimer& timer) { // Avoid to process spurious timer events - if ( timer.id == 0) + if ( timer.m_id == 0) return; - if ( timer.oneShot ) + if ( timer.IsOneShot() ) timer.Stop(); timer.Notify();