X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ad81651f00edc6f489d9b6a0839d316a964fd521..97ade792e92de65bd213c9b414c88341ca613611:/src/mac/carbon/timer.cpp

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index d845d50108..c5beb16cf1 100644
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -1,50 +1,99 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.cpp
+// Name:        sec/mac/carbon/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__
-#pragma implementation "timer.h"
+#include "wx/wxprec.h"
+
+#if wxUSE_TIMER
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
 #endif
 
-#include "wx/timer.h"
+#include "wx/mac/private/timer.h"
 
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+#ifdef __WXMAC__
+    #include "wx/mac/private.h"
+#endif
+
+struct MacTimerInfo
+{
+    wxCarbonTimerImpl* m_timer;
+    EventLoopTimerUPP m_proc;
+    EventLoopTimerRef   m_timerRef;
+};
 
-wxTimer::wxTimer()
+static pascal void wxProcessTimer( EventLoopTimerRef WXUNUSED(theTimer), void *data )
 {
-    m_milli = 0 ;
-    m_id = 0;
-    m_oneShot = FALSE;
+    if ( data == NULL )
+        return;
+
+    wxCarbonTimerImpl* timer = (wxCarbonTimerImpl*)data;
+
+    if ( timer->IsOneShot() )
+        timer->Stop();
+
+    timer->Notify();
 }
 
-wxTimer::~wxTimer()
+wxCarbonTimerImpl::wxCarbonTimerImpl(wxTimer *timer)
+                 : wxTimerImpl(timer)
 {
-    Stop();
+    m_info = new MacTimerInfo();
+    m_info->m_timer = this;
+    m_info->m_proc = NULL;
+    m_info->m_timerRef = kInvalidID;
 }
 
-bool wxTimer::Start(int milliseconds,bool mode)
+bool wxCarbonTimerImpl::IsRunning() const
 {
-    m_oneShot = mode ;
-    if (milliseconds <= 0)
-        return FALSE;
+    return ( m_info->m_timerRef != kInvalidID );
+}
 
-    m_milli = milliseconds;
+wxCarbonTimerImpl::~wxCarbonTimerImpl()
+{
+    delete m_info;
+}
+
+bool wxCarbonTimerImpl::Start( int milliseconds, bool mode )
+{
+    (void)wxTimerImpl::Start(milliseconds, mode);
 
-    // TODO: set the timer going.
-    return FALSE;
+    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") );
+
+    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()
 {
-    m_id = 0 ;
-    m_milli = 0 ;
+    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