Added log.h inclusion

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

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index e2693c3e8ad635eb67cd18c154564949a8186cb9..2355b8eaceba62af11fa3374cd65982502eebf22 100644 (file)
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -22,6 +22,11 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
 #ifdef __WXMAC__
 #include "wx/mac/private.h"
 #endif
+#ifndef __DARWIN__
+#include <Timer.h>
+#endif
+
+#include "wx/dynarray.h"
 
 typedef struct MacTimerInfo
 {
@@ -38,20 +43,33 @@ static pascal void MacTimerProc( TMTask * 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() ;
                
+       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() ) ;
+        }
+    
     }
 }
 
@@ -74,8 +92,13 @@ bool wxTimer::IsRunning() const
 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)