X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/mac/timer.cpp diff --git a/src/mac/timer.cpp b/src/mac/timer.cpp index d845d50108..d485c86b8c 100644 --- a/src/mac/timer.cpp +++ b/src/mac/timer.cpp @@ -15,36 +15,105 @@ #include "wx/timer.h" +#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) +#endif + +#ifdef __WXMAC__ +#include "wx/mac/private.h" +#endif +#ifndef __DARWIN__ +#include +#endif -wxTimer::wxTimer() +typedef struct MacTimerInfo { - m_milli = 0 ; - m_id = 0; - m_oneShot = FALSE; + TMTask m_task; + wxMacNotifierTableRef m_table ; + wxTimer* m_timer ; +} ; + +static void wxProcessTimer( unsigned long event , void *data ) ; + +static pascal void MacTimerProc( TMTask * t ) +{ + MacTimerInfo * tm = (MacTimerInfo*) t ; + wxMacAddEvent( tm->m_table , wxProcessTimer, 0 , (void*) tm->m_timer , TRUE ) ; +} + +static void wxProcessTimer( unsigned long event , void *data ) +{ + if ( !data ) + return ; + + wxTimer* timer = (wxTimer*) data ; + if ( timer->IsOneShot() ) + timer->Stop() ; + + timer->Notify(); + + if ( timer->m_info->m_task.tmAddr && !timer->IsOneShot() ) + { + PrimeTime( (QElemPtr) &timer->m_info->m_task , timer->GetInterval() ) ; + } +} + +void wxTimer::Init() +{ + m_info = new MacTimerInfo() ; + m_info->m_task.tmAddr = NULL ; + m_info->m_task.tmWakeUp = 0 ; + m_info->m_task.tmReserved = 0 ; + m_info->m_task.qType = 0 ; + m_info->m_table = wxMacGetNotifierTable() ; + m_info->m_timer = this ; +} + +bool wxTimer::IsRunning() const +{ + return ( m_info->m_task.qType & kTMTaskActive ) ; } wxTimer::~wxTimer() { Stop(); + delete m_info ; + m_info = NULL ; } bool wxTimer::Start(int milliseconds,bool mode) { - m_oneShot = mode ; - if (milliseconds <= 0) - return FALSE; + (void)wxTimerBase::Start(milliseconds, mode); - m_milli = milliseconds; + wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeour") ); + wxCHECK_MSG( m_info->m_task.tmAddr == NULL , FALSE, wxT("attempting to restart a timer") ); - // TODO: set the timer going. + m_milli = milliseconds; +#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340) + m_info->m_task.tmAddr = NewTimerUPP( MacTimerProc ) ; +#else + m_info->m_task.tmAddr = NewTimerProc( MacTimerProc ) ; +#endif + m_info->m_task.tmWakeUp = 0 ; + m_info->m_task.tmReserved = 0 ; + m_info->m_task.qType = 0 ; + m_info->m_timer = this ; + InsXTime((QElemPtr) &m_info->m_task ) ; + PrimeTime( (QElemPtr) &m_info->m_task , m_milli ) ; return FALSE; } void wxTimer::Stop() { - m_id = 0 ; m_milli = 0 ; + if ( m_info->m_task.tmAddr ) + { + RmvTime( (QElemPtr) &m_info->m_task ) ; + DisposeTimerUPP(m_info->m_task.tmAddr) ; + m_info->m_task.tmAddr = NULL ; + } + wxMacRemoveAllNotifiersForData( wxMacGetNotifierTable() , this ) ; } +