X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c085e333984dc079a001cd3f581aeb1f51a1f227..5d483828d77426eed11fa19c3f2f318383a118dc:/src/msw/timer.cpp diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index 844e0b1f56..7d994c9938 100644 --- a/src/msw/timer.cpp +++ b/src/msw/timer.cpp @@ -6,17 +6,9 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - #ifdef __GNUG__ #pragma implementation "timer.h" #endif @@ -30,22 +22,17 @@ #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 "wx/msw/private.h" - -#include -#include -#if !defined(__SC__) && !defined(__GNUWIN32__) - #include -#endif +#include "wx/msw/private.h" // ---------------------------------------------------------------------------- // private functions @@ -59,14 +46,12 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD); // ---------------------------------------------------------------------------- #ifdef __WIN32__ - #define _EXPORT /**/ + #define _EXPORT #else #define _EXPORT _export #endif -#if !USE_SHARED_LIBRARY - IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) -#endif +IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) // ============================================================================ // implementation @@ -75,39 +60,34 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD); // ---------------------------------------------------------------------------- // wxTimer class // ---------------------------------------------------------------------------- -wxTimer::wxTimer(void) + +void wxTimer::Init() { - milli = 0 ; - lastMilli = -1 ; - id = 0; + m_id = 0; } -wxTimer::~wxTimer(void) +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, "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; } @@ -119,26 +99,28 @@ bool wxTimer::Start(int milliseconds, bool mode) } } -void wxTimer::Stop(void) +void wxTimer::Stop() { - if (id) { - KillTimer(NULL, (UINT)id); - wxTimerList.DeleteObject(this); /* @@@@ */ + if ( m_id ) + { + KillTimer(NULL, (UINT)m_id); + wxTimerList.DeleteObject(this); } - id = 0 ; - milli = 0 ; + + m_id = 0; } // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- -static void wxProcessTimer(wxTimer& timer) + +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(); @@ -148,7 +130,7 @@ UINT WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD) { wxNode *node = wxTimerList.Find((long)idTimer); - wxCHECK_MSG( node, 0, "bogus timer id in wxTimerProc" ); + wxCHECK_MSG( node, 0, wxT("bogus timer id in wxTimerProc") ); wxProcessTimer(*(wxTimer *)node->Data());