X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9576ca53db96b462ed4c0b4bdf47d64c40203e4..a8e6bf8ae22d1d76bcbe1e42519b2f425718fbc2:/src/mac/carbon/timer.cpp?ds=sidebyside

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index 5262040cf6..f2b5f2e896 100644
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -19,11 +19,44 @@
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
 #endif
 
-wxTimer::wxTimer()
+static void wxProcessTimer( unsigned long event , void *data ) ;
+
+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()
@@ -33,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 ) ;
 }
 
 
+