X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9814d926198c75333d972f408fa527f84e9355d3..9b49405777342458dc1666001865eef7309b6c30:/src/generic/timer.cpp diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp index 63fe3a3e9f..4f7ebe8bf1 100644 --- a/src/generic/timer.cpp +++ b/src/generic/timer.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: mgl/timer.cpp +// Name: src/generic/timer.cpp // Purpose: wxTimer implementation // Author: Vaclav Slavik // Id: $Id$ @@ -7,10 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "timer.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -24,12 +20,15 @@ // is in wxEventLoop::Dispatch(). // ---------------------------------------------------------------------------- -#include "wx/timer.h" - #if wxUSE_TIMER -#include "wx/log.h" -#include "wx/module.h" +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/module.h" +#endif + +#include "wx/apptrait.h" +#include "wx/generic/private/timer.h" // ---------------------------------------------------------------------------- // Time input function @@ -95,15 +94,15 @@ class wxTimerDesc { public: - wxTimerDesc(wxTimer *t) : + wxTimerDesc(wxGenericTimerImpl *t) : timer(t), running(false), next(NULL), prev(NULL), shotTime(0), deleteFlag(NULL) {} - wxTimer *timer; - bool running; - wxTimerDesc *next, *prev; - wxTimerTick_t shotTime; - volatile bool *deleteFlag; // see comment in ~wxTimer + wxGenericTimerImpl *timer; + bool running; + wxTimerDesc *next, *prev; + wxTimerTick_t shotTime; + volatile bool *deleteFlag; // see comment in ~wxTimer }; class wxTimerScheduler @@ -194,7 +193,11 @@ void wxTimerScheduler::NotifyTimers() QueueTimer(desc, now + desc->timer->GetInterval()); } else + { desc = m_timers; + if (!desc) + break; + } } } } @@ -205,18 +208,16 @@ void wxTimerScheduler::NotifyTimers() // wxTimer // ---------------------------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler) - wxTimerScheduler *gs_scheduler = NULL; -void wxTimer::Init() +void wxGenericTimerImpl::Init() { if ( !gs_scheduler ) gs_scheduler = new wxTimerScheduler; m_desc = new wxTimerDesc(this); } -wxTimer::~wxTimer() +wxGenericTimerImpl::~wxGenericTimerImpl() { wxLogTrace( wxT("timer"), wxT("destroying timer %p..."), this); if ( IsRunning() ) @@ -233,31 +234,31 @@ wxTimer::~wxTimer() wxLogTrace( wxT("timer"), wxT(" ...done destroying timer %p..."), this); } -bool wxTimer::IsRunning() const +bool wxGenericTimerImpl::IsRunning() const { return m_desc->running; } -bool wxTimer::Start(int millisecs, bool oneShot) +bool wxGenericTimerImpl::Start(int millisecs, bool oneShot) { wxLogTrace( wxT("timer"), wxT("started timer %p: %i ms, oneshot=%i"), this, millisecs, oneShot); - if ( !wxTimerBase::Start(millisecs, oneShot) ) - return false; + if ( !wxTimerImpl::Start(millisecs, oneShot) ) + return false; gs_scheduler->QueueTimer(m_desc); return true; } -void wxTimer::Stop() +void wxGenericTimerImpl::Stop() { if ( !m_desc->running ) return; gs_scheduler->RemoveTimer(m_desc); } -/*static*/ void wxTimer::NotifyTimers() +/*static*/ void wxGenericTimerImpl::NotifyTimers() { if ( gs_scheduler ) gs_scheduler->NotifyTimers(); @@ -277,5 +278,14 @@ public: IMPLEMENT_DYNAMIC_CLASS(wxTimerModule, wxModule) +// ---------------------------------------------------------------------------- +// wxGUIAppTraits +// ---------------------------------------------------------------------------- + +wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) +{ + return new wxGenericTimerImpl(timer); +} + #endif //wxUSE_TIMER