X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/604b66c10b5503d2033396a6823b8cef5661093f..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/mac/carbon/timer.cpp diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp index a639e2c464..f7a1a01fd8 100644 --- a/src/mac/carbon/timer.cpp +++ b/src/mac/carbon/timer.cpp @@ -9,15 +9,15 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "timer.h" #endif +#include "wx/wxprec.h" + #include "wx/timer.h" -#if !USE_SHARED_LIBRARY -IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) -#endif +IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler) #ifdef __WXMAC__ #include "wx/mac/private.h" @@ -28,6 +28,84 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) #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; @@ -114,11 +192,7 @@ bool wxTimer::Start(int milliseconds,bool mode) wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeout") ); wxCHECK_MSG( m_info->m_task.tmAddr == NULL , FALSE, wxT("attempting to restart a timer") ); -#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 ; @@ -139,5 +213,6 @@ void wxTimer::Stop() wxMacRemoveAllNotifiersForData( wxMacGetNotifierTable() , this ) ; } +#endif