X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66a09d4776b8ae390d5aa51dbd678b694f2c81d6..0ebb0e5c842c2a0be09364bda0d14b3281ddec43:/src/mac/timer.cpp?ds=sidebyside

diff --git a/src/mac/timer.cpp b/src/mac/timer.cpp
index d485c86b8c..4fcae35e09 100644
--- a/src/mac/timer.cpp
+++ b/src/mac/timer.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        timer.cpp
 // Purpose:     wxTimer implementation
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:   	wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -26,6 +26,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
 #include <Timer.h>
 #endif
 
+#include "wx/dynarray.h"
+
 typedef struct MacTimerInfo
 {
     TMTask m_task;
@@ -37,48 +39,66 @@ static void wxProcessTimer( unsigned long event , void *data ) ;
 
 static pascal void MacTimerProc( TMTask * t )
 {
-	MacTimerInfo * tm = (MacTimerInfo*)  t ;
-	wxMacAddEvent( tm->m_table , wxProcessTimer, 0 , (void*) tm->m_timer , TRUE ) ;
+    MacTimerInfo * tm = (MacTimerInfo*)  t ;
+    wxMacAddEvent( tm->m_table , wxProcessTimer, 0 , (void*) tm->m_timer , TRUE ) ;
 }
 
+wxArrayPtrVoid gTimersInProcess ;
+
 static void wxProcessTimer( unsigned long event , void *data )
 {
-	if ( !data )
-		return ;
-		
-	wxTimer* timer = (wxTimer*) data ;
-	if ( timer->IsOneShot() )
-		timer->Stop() ;
-		
+    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() ) ;
+        }
+    
     }
 }
 
 void wxTimer::Init()
 {
     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 ;
+    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();
-    delete m_info ;
-    m_info = NULL ;
+    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)
@@ -88,7 +108,6 @@ bool wxTimer::Start(int milliseconds,bool 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") );
 
-    m_milli = milliseconds;
 #if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
     m_info->m_task.tmAddr = NewTimerUPP( MacTimerProc ) ;
 #else
@@ -96,21 +115,20 @@ bool wxTimer::Start(int milliseconds,bool mode)
 #endif
     m_info->m_task.tmWakeUp = 0 ;
     m_info->m_task.tmReserved = 0 ;
-	m_info->m_task.qType = 0 ;
-	m_info->m_timer = this ;
+    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;
+    return TRUE;
 }
 
 void wxTimer::Stop()
 {
-    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 ;
+        RmvTime(  (QElemPtr) &m_info->m_task ) ;
+        DisposeTimerUPP(m_info->m_task.tmAddr) ;
+        m_info->m_task.tmAddr = NULL ;
     }
     wxMacRemoveAllNotifiersForData( wxMacGetNotifierTable() , this ) ;
 }