X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/368ba124ef595673529f7089cd2089adbcd00e6b..6cef0db28018fd2644ee4e38af715872e5242459:/src/mac/carbon/timer.cpp

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index 4fcae35e09..c5beb16cf1 100644
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -1,137 +1,99 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.cpp
+// Name:        sec/mac/carbon/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "timer.h"
-#endif
+#include "wx/wxprec.h"
 
-#include "wx/timer.h"
+#if wxUSE_TIMER
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
 #endif
 
+#include "wx/mac/private/timer.h"
+
 #ifdef __WXMAC__
-#include "wx/mac/private.h"
+    #include "wx/mac/private.h"
 #endif
-#ifndef __DARWIN__
-#include <Timer.h>
-#endif
-
-#include "wx/dynarray.h"
 
-typedef struct MacTimerInfo
+struct MacTimerInfo
 {
-    TMTask m_task;
-    wxMacNotifierTableRef m_table ;
-    wxTimer* m_timer ;
-} ;
+    wxCarbonTimerImpl* m_timer;
+    EventLoopTimerUPP m_proc;
+    EventLoopTimerRef   m_timerRef;
+};
 
-static void wxProcessTimer( unsigned long event , void *data ) ;
-
-static pascal void MacTimerProc( TMTask * t )
+static pascal void wxProcessTimer( EventLoopTimerRef WXUNUSED(theTimer), void *data )
 {
-    MacTimerInfo * tm = (MacTimerInfo*)  t ;
-    wxMacAddEvent( tm->m_table , wxProcessTimer, 0 , (void*) tm->m_timer , TRUE ) ;
-}
+    if ( data == NULL )
+        return;
 
-wxArrayPtrVoid gTimersInProcess ;
+    wxCarbonTimerImpl* timer = (wxCarbonTimerImpl*)data;
 
-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();
+        timer->Stop();
 
-    int index = gTimersInProcess.Index( timer ) ;
-    
-    if ( index != wxNOT_FOUND )
-    {
-        gTimersInProcess.RemoveAt( index ) ;
-        
-        if ( !timer->IsOneShot() && timer->m_info->m_task.tmAddr )
-        {
-            PrimeTime( (QElemPtr)  &timer->m_info->m_task , timer->GetInterval() ) ;
-        }
-    
-    }
+    timer->Notify();
 }
 
-void wxTimer::Init()
+wxCarbonTimerImpl::wxCarbonTimerImpl(wxTimer *timer)
+                 : wxTimerImpl(timer)
 {
-    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 = new MacTimerInfo();
+    m_info->m_timer = this;
+    m_info->m_proc = NULL;
+    m_info->m_timerRef = kInvalidID;
 }
 
-bool wxTimer::IsRunning() const 
+bool wxCarbonTimerImpl::IsRunning() const
 {
-    return ( m_info->m_task.qType & kTMTaskActive ) ;
+    return ( m_info->m_timerRef != kInvalidID );
 }
 
-wxTimer::~wxTimer()
+wxCarbonTimerImpl::~wxCarbonTimerImpl()
 {
-    Stop();
-    if (m_info != NULL) {
-        delete m_info ;
-        m_info = NULL ;
-    }
-    int index = gTimersInProcess.Index( this ) ;
-    if ( index != wxNOT_FOUND )
-        gTimersInProcess.RemoveAt( index ) ;  
+    delete m_info;
 }
 
-bool wxTimer::Start(int milliseconds,bool mode)
+bool wxCarbonTimerImpl::Start( int milliseconds, bool mode )
 {
-    (void)wxTimerBase::Start(milliseconds, mode);
+    (void)wxTimerImpl::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_milli > 0, false, wxT("invalid value for timer timeout") );
+    wxCHECK_MSG( m_info->m_timerRef == NULL, false, wxT("attempting to restart a timer") );
 
-#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 TRUE;
+    m_info->m_timer = this;
+    m_info->m_proc = NewEventLoopTimerUPP( &wxProcessTimer );
+
+    OSStatus err = InstallEventLoopTimer(
+        GetMainEventLoop(),
+        m_milli*kEventDurationMillisecond,
+        IsOneShot() ? 0 : m_milli * kEventDurationMillisecond,
+        m_info->m_proc,
+        this,
+        &m_info->m_timerRef );
+    verify_noerr( err );
+
+    return true;
 }
 
-void wxTimer::Stop()
+void wxCarbonTimerImpl::Stop()
 {
-    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 ) ;
-}
+    if (m_info->m_timerRef)
+        RemoveEventLoopTimer( m_info->m_timerRef );
+    if (m_info->m_proc)
+        DisposeEventLoopTimerUPP( m_info->m_proc );
 
+    m_info->m_proc = NULL;
+    m_info->m_timerRef = kInvalidID;
+}
 
+#endif // wxUSE_TIMER