1. some more tests in console

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

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index d845d50108efea892a4dff22c4d4c0e09344fb30..3d0bb31c08e718579e87b0449ec457dad83e404b 100644 (file)
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -15,13 +15,48 @@
 
 #include "wx/timer.h"
 
 
 #include "wx/timer.h"
 

+#if !USE_SHARED_LIBRARY

 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)

+#endif
+
+static void wxProcessTimer( unsigned long event , void *data ) ;
+
+pascal void MacTimerProc( TMTask * t )
+{
+       MacTimerInfo * tm = (MacTimerInfo*)  t ;
+       wxMacAddEvent( tm->m_table , wxProcessTimer, 0 , (void*) tm->m_timer , TRUE ) ;
+}
+
+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() ) ;
+    }
+}

 
 wxTimer::wxTimer()
 {
 
 wxTimer::wxTimer()
 {

-    m_milli = 0 ;
-    m_id = 0;
-    m_oneShot = FALSE;
+       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()
 }
 
 wxTimer::~wxTimer()


@@ -31,20 +66,31 @@ wxTimer::~wxTimer()
 
 bool wxTimer::Start(int milliseconds,bool mode)
 {
 
 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;
+       m_info.m_task.tmAddr = NewTimerProc( MacTimerProc ) ;
+       m_info.m_task.tmWakeUp = 0 ;
+       m_info.m_task.tmReserved = 0 ;
+    InsXTime((QElemPtr) &m_info.m_task ) ;
+    PrimeTime( (QElemPtr) &m_info.m_task , m_milli ) ;

     return FALSE;
 }
 
 void wxTimer::Stop()
 {
     return FALSE;
 }
 
 void wxTimer::Stop()
 {

-    m_id = 0 ;

     m_milli = 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 ) ;

 }
 
 
 }
 
 

+