X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2f1ae4143271ae63a17e052a1a471d16e9cd8c44..467e3168b33200bf6d62317294799363ed7dd50e:/src/mac/timer.cpp?ds=inline

diff --git a/src/mac/timer.cpp b/src/mac/timer.cpp
index 3d0bb31c08..2355b8eace 100644
--- a/src/mac/timer.cpp
+++ b/src/mac/timer.cpp
@@ -19,49 +19,86 @@
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
 #endif
 
+#ifdef __WXMAC__
+#include "wx/mac/private.h"
+#endif
+#ifndef __DARWIN__
+#include <Timer.h>
+#endif
+
+#include "wx/dynarray.h"
+
+typedef struct MacTimerInfo
+{
+    TMTask m_task;
+    wxMacNotifierTableRef m_table ;
+    wxTimer* m_timer ;
+} ;
+
 static void wxProcessTimer( unsigned long event , void *data ) ;
 
-pascal void MacTimerProc( TMTask * t )
+static 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 )
+wxArrayPtrVoid gTimersInProcess ;
+
+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();
 
-    if ( timer->m_info.m_task.tmAddr && !timer->IsOneShot() )
+    int index = gTimersInProcess.Index( timer ) ;
+    
+    if ( index != wxNOT_FOUND )
     {
-	    PrimeTime( (QElemPtr)  &timer->m_info.m_task , timer->GetInterval() ) ;
+        gTimersInProcess.RemoveAt( index ) ;
+        
+        if ( !timer->IsOneShot() && timer->m_info->m_task.tmAddr )
+        {
+    	    PrimeTime( (QElemPtr)  &timer->m_info->m_task , timer->GetInterval() ) ;
+        }
+    
     }
 }
 
-wxTimer::wxTimer()
+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 ;
+    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 wxTimer::IsRunning() const 
 {
-	return ( m_info.m_task.qType & kTMTaskActive ) ;
+	return ( m_info->m_task.qType & kTMTaskActive ) ;
 }
 
 wxTimer::~wxTimer()
 {
     Stop();
+    if (m_info != NULL) {
+        delete m_info ;
+        m_info = NULL ;
+    }
+    int index = gTimersInProcess.Index( this ) ;
+    if ( index != wxNOT_FOUND )
+        gTimersInProcess.RemoveAt( index ) ;  
 }
 
 bool wxTimer::Start(int milliseconds,bool mode)
@@ -69,25 +106,31 @@ bool wxTimer::Start(int milliseconds,bool mode)
     (void)wxTimerBase::Start(milliseconds, mode);
 
     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") );
+    wxCHECK_MSG( m_info->m_task.tmAddr == NULL , FALSE, wxT("attempting to restart a timer") );
 
     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 ) ;
+#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_milli = 0 ;
-    if ( m_info.m_task.tmAddr )
+    if ( m_info->m_task.tmAddr )
     {
-    	RmvTime(  (QElemPtr) &m_info.m_task ) ;
-    	DisposeTimerUPP(m_info.m_task.tmAddr) ;
-    	m_info.m_task.tmAddr = NULL ;
+    	RmvTime(  (QElemPtr) &m_info->m_task ) ;
+    	DisposeTimerUPP(m_info->m_task.tmAddr) ;
+    	m_info->m_task.tmAddr = NULL ;
     }
     wxMacRemoveAllNotifiersForData( wxMacGetNotifierTable() , this ) ;
 }