drawing methods cleanup

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

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index d845d50108efea892a4dff22c4d4c0e09344fb30..f2b5f2e8961ec113b98baac62f9bd738d3713359 100644 (file)
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -15,13 +15,48 @@
 
 #include "wx/timer.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+#endif
+
+static void wxProcessTimer( unsigned long event , void *data ) ;
 
-wxTimer::wxTimer()
+static pascal void MacTimerProc( TMTask * t )
 {
-    m_milli = 0 ;
-    m_id = 0;
-    m_oneShot = FALSE;
+       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.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()
@@ -31,20 +66,37 @@ wxTimer::~wxTimer()
 
 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 ) ;
 }
 
 
+