X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4db172a3b318df9aff178eb6c5da149d56e0859..d2e66707deb10dea6f92e3e4092f8a43ef942a5d:/src/generic/timer.cpp?ds=sidebyside diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp index 92b513ef35..8e76ca8c23 100644 --- a/src/generic/timer.cpp +++ b/src/generic/timer.cpp @@ -22,13 +22,13 @@ #if wxUSE_TIMER -#include "wx/timer.h" - #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/module.h" #endif -#include "wx/module.h" +#include "wx/apptrait.h" +#include "wx/generic/private/timer.h" // ---------------------------------------------------------------------------- // Time input function @@ -44,12 +44,12 @@ typedef ulong wxTimerTick_t; - #define wxTimerTickFmtSpec _T("lu") + #define wxTimerTickFmtSpec wxT("lu") #define wxTimerTickPrintfArg(tt) (tt) #ifdef __DOS__ // Under DOS the MGL timer has a 24hr period, so consider the 12 hours - // before y to be 'less' and the the 12 hours after 'greater' modulo + // before y to be 'less' and the 12 hours after 'greater' modulo // 24 hours. inline bool wxTickGreaterEqual(wxTimerTick_t x, wxTimerTick_t y) { @@ -74,10 +74,10 @@ typedef wxLongLong wxTimerTick_t; #if wxUSE_LONGLONG_WX - #define wxTimerTickFmtSpec wxLongLongFmtSpec _T("d") + #define wxTimerTickFmtSpec wxLongLongFmtSpec "d" #define wxTimerTickPrintfArg(tt) (tt.GetValue()) #else // using native wxLongLong - #define wxTimerTickFmtSpec _T("s") + #define wxTimerTickFmtSpec wxT("s") #define wxTimerTickPrintfArg(tt) (tt.ToString().c_str()) #endif // wx/native long long @@ -94,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 @@ -208,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() ) @@ -236,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(); @@ -275,10 +273,19 @@ DECLARE_DYNAMIC_CLASS(wxTimerModule) public: wxTimerModule() {} bool OnInit() { return true; } - void OnExit() { delete gs_scheduler; gs_scheduler = NULL; } + void OnExit() { wxDELETE(gs_scheduler); } }; IMPLEMENT_DYNAMIC_CLASS(wxTimerModule, wxModule) +// ---------------------------------------------------------------------------- +// wxGUIAppTraits +// ---------------------------------------------------------------------------- + +wxTimerImpl *wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) +{ + return new wxGenericTimerImpl(timer); +} + #endif //wxUSE_TIMER