From 514982b2d838b45063e2b8462656ebc1aac6863e Mon Sep 17 00:00:00 2001 From: Stefan Csomor <csomor@advancedconcepts.ch> Date: Thu, 20 May 2004 15:54:09 +0000 Subject: [PATCH] first implementation of carbon timers git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/timer.cpp | 79 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp index fd06d47dfb..6830dd25cb 100644 --- a/src/mac/carbon/timer.cpp +++ b/src/mac/carbon/timer.cpp @@ -28,6 +28,84 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler) #include "wx/dynarray.h" +#define wxMAC_USE_CARBON_TIMER 1 + +#if wxMAC_USE_CARBON_TIMER + +typedef struct MacTimerInfo +{ + wxTimer* m_timer ; + EventLoopTimerUPP m_proc ; + EventLoopTimerRef m_timerRef ; +} ; + +static pascal void wxProcessTimer( EventLoopTimerRef theTimer , void *data ) ; +static pascal void wxProcessTimer( EventLoopTimerRef theTimer , void *data ) +{ + if ( !data ) + return ; + + wxTimer* timer = (wxTimer*) data ; + + if ( timer->IsOneShot() ) + timer->Stop() ; + + timer->Notify(); +} + +void wxTimer::Init() +{ + m_info = new MacTimerInfo() ; + m_info->m_timer = this ; + m_info->m_proc = NULL ; + m_info->m_timerRef = kInvalidID ; +} + +bool wxTimer::IsRunning() const +{ + return ( m_info->m_timerRef != kInvalidID ) ; +} + +wxTimer::~wxTimer() +{ + Stop(); + if (m_info != NULL) { + delete m_info ; + m_info = NULL ; + } +} + +bool wxTimer::Start(int milliseconds,bool mode) +{ + (void)wxTimerBase::Start(milliseconds, mode); + + wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeout") ); + wxCHECK_MSG( m_info->m_timerRef == NULL , FALSE, wxT("attempting to restart a timer") ); + + m_info->m_timer = this ; + m_info->m_proc = NewEventLoopTimerUPP( &wxProcessTimer); + verify_noerr( InstallEventLoopTimer ( + GetMainEventLoop() , + m_milli*kEventDurationMillisecond, + IsOneShot() ? 0 : m_milli*kEventDurationMillisecond , + m_info->m_proc, + this, + &m_info->m_timerRef) ) ; + return TRUE; +} + +void wxTimer::Stop() +{ + if (m_info->m_timerRef) + RemoveEventLoopTimer( m_info->m_timerRef ) ; + if (m_info->m_proc) + DisposeEventLoopTimerUPP(m_info->m_proc) ; + m_info->m_proc = NULL ; + m_info->m_timerRef = kInvalidID ; +} + +#else + typedef struct MacTimerInfo { TMTask m_task; @@ -135,5 +213,6 @@ void wxTimer::Stop() wxMacRemoveAllNotifiersForData( wxMacGetNotifierTable() , this ) ; } +#endif -- 2.45.2