cleanup mac

[wxWidgets.git] / src / mac / carbon / timer.cpp

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index 28179a84f4820ed0b3bd62acd55f279524c36bad..c5beb16cf12f28cefd0cdf0a2f471f2dfab5daee 100644 (file)
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -23,14 +23,6 @@
     #include "wx/mac/private.h"
 #endif
 
-#ifndef __DARWIN__
-    #include <Timer.h>
-#endif
-
-#define wxMAC_USE_CARBON_TIMER 1
-
-#if wxMAC_USE_CARBON_TIMER
-
 struct MacTimerInfo
 {
     wxCarbonTimerImpl* m_timer;
@@ -38,7 +30,7 @@ struct MacTimerInfo
     EventLoopTimerRef   m_timerRef;
 };
 
-static pascal void wxProcessTimer( EventLoopTimerRef theTimer, void *data )
+static pascal void wxProcessTimer( EventLoopTimerRef WXUNUSED(theTimer), void *data )
 {
     if ( data == NULL )
         return;
@@ -103,114 +95,5 @@ void wxCarbonTimerImpl::Stop()
     m_info->m_timerRef = kInvalidID;
 }
 
-#else // !wxMAC_USE_CARBON_TIMER
-
-typedef struct MacTimerInfo
-{
-    TMTask m_task;
-    wxMacNotifierTableRef m_table;
-    wxCarbonTimerImpl* 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 );
-}
-
-// we need this array to track timers that are being deleted within the Notify procedure
-// adding the timer before the Notify call and checking after whether it still is in there
-// as the destructor would have removed it from the array
-
-wxArrayPtrVoid gTimersInProcess;
-
-static void wxProcessTimer( unsigned long event, void *data )
-{
-    if ( data == NULL )
-        return;
-
-    wxCarbonTimerImpl* timer = (wxCarbonTimerImpl*) data;
-    if ( timer->m_oneShot )
-        timer->Stop();
-
-    gTimersInProcess.Add( timer );
-    timer->Notify();
-
-    int index = gTimersInProcess.Index( timer );
-    if ( index != wxNOT_FOUND )
-    {
-        gTimersInProcess.RemoveAt( index );
-
-        if ( !timer->IsOneShot() && timer->m_info->m_task.tmAddr )
-            PrimeTime( (QElemPtr) &timer->m_info->m_task, timer->GetInterval() );
-    }
-}
-
-void wxCarbonTimerImpl::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 wxCarbonTimerImpl::IsRunning() const
-{
-    // as the qType may already indicate it is elapsed, but it
-    // was not handled internally yet
-    return ( m_info->m_task.tmAddr != NULL );
-}
-
-wxCarbonTimerImpl::~wxCarbonTimerImpl()
-{
-    Stop();
-    if (m_info != NULL)
-    {
-        delete m_info;
-        m_info = NULL;
-    }
-
-    int index = gTimersInProcess.Index( this );
-    if ( index != wxNOT_FOUND )
-        gTimersInProcess.RemoveAt( index );
-}
-
-bool wxCarbonTimerImpl::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_task.tmAddr == NULL, false, wxT("attempting to restart a timer") );
-
-    m_info->m_task.tmAddr = NewTimerUPP( MacTimerProc );
-    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 true;
-}
-
-void wxCarbonTimerImpl::Stop()
-{
-    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 );
-}
-
-#endif // wxMAC_USE_CARBON_TIMER/!wxMAC_USE_CARBON_TIMER
-
 #endif // wxUSE_TIMER