cleanup - reformat

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

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index fd06d47dfbc78c6ccfea85c24e9a014945e569fb..a4a2b9f382af6ccf72ac531d1fc8c44c851ed61f 100644 (file)
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -9,15 +9,11 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "timer.h"
-#endif
+#include "wx/wxprec.h"
 
 #include "wx/timer.h"
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-#endif
 
 #ifdef __WXMAC__
 #include "wx/mac/private.h"
@@ -28,6 +24,84 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
 #include "wx/dynarray.h"
 
+#define wxMAC_USE_CARBON_TIMER 1
+
+#if wxMAC_USE_CARBON_TIMER
+
+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;
@@ -44,7 +118,7 @@ static pascal void MacTimerProc( TMTask * t )
 }
 
 // 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 
+// 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 ;
@@ -53,27 +127,27 @@ static void wxProcessTimer( unsigned long event , void *data )
 {
     if ( !data )
         return ;
-        
+
     wxTimer* timer = (wxTimer*) data ;
-    
+
     if ( timer->IsOneShot() )
         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() ) ;
         }
-    
+
     }
 }
 
@@ -88,7 +162,7 @@ void wxTimer::Init()
     m_info->m_timer = this ;
 }
 
-bool wxTimer::IsRunning() const 
+bool wxTimer::IsRunning() const
 {
     // as the qType may already indicate it is elapsed, but it
     // was not handled internally yet
@@ -104,15 +178,15 @@ wxTimer::~wxTimer()
     }
     int index = gTimersInProcess.Index( this ) ;
     if ( index != wxNOT_FOUND )
-        gTimersInProcess.RemoveAt( index ) ;  
+        gTimersInProcess.RemoveAt( index ) ;
 }
 
 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_task.tmAddr == NULL , FALSE, wxT("attempting to restart a timer") );
+    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 ;
@@ -121,7 +195,7 @@ bool wxTimer::Start(int milliseconds,bool mode)
     m_info->m_timer = this ;
     InsXTime((QElemPtr) &m_info->m_task ) ;
     PrimeTime( (QElemPtr) &m_info->m_task , m_milli ) ;
-    return TRUE;
+    return true;
 }
 
 void wxTimer::Stop()
@@ -135,5 +209,6 @@ void wxTimer::Stop()
     wxMacRemoveAllNotifiersForData( wxMacGetNotifierTable() , this ) ;
 }
 
+#endif