pen.h depends from brush.h in compat mode

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

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index c17eb429fc7a694927488702df3c135d1b184bd6..c5beb16cf12f28cefd0cdf0a2f471f2dfab5daee 100644 (file)
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -11,40 +11,31 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#if wxUSE_TIMER
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
 #endif
 
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
 #endif
 

-#include "wx/timer.h"
+#include "wx/mac/private/timer.h"

 
 #ifdef __WXMAC__
     #include "wx/mac/private.h"
 #endif
 
 
 #ifdef __WXMAC__
     #include "wx/mac/private.h"
 #endif
 

-#ifndef __DARWIN__
-    #include <Timer.h>
-#endif
-
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-
-#define wxMAC_USE_CARBON_TIMER 1
-
-#if wxMAC_USE_CARBON_TIMER
-

 struct MacTimerInfo
 {
 struct MacTimerInfo
 {

-    wxTimer* m_timer;
+    wxCarbonTimerImpl* m_timer;

     EventLoopTimerUPP m_proc;
     EventLoopTimerRef   m_timerRef;
 };
 
     EventLoopTimerUPP m_proc;
     EventLoopTimerRef   m_timerRef;
 };
 

-static pascal void wxProcessTimer( EventLoopTimerRef theTimer, void *data );
-static pascal void wxProcessTimer( EventLoopTimerRef theTimer, void *data )
+static pascal void wxProcessTimer( EventLoopTimerRef WXUNUSED(theTimer), void *data )

 {
     if ( data == NULL )
         return;
 
 {
     if ( data == NULL )
         return;
 

-    wxTimer* timer = (wxTimer*)data;
+    wxCarbonTimerImpl* timer = (wxCarbonTimerImpl*)data;

 
     if ( timer->IsOneShot() )
         timer->Stop();
 
     if ( timer->IsOneShot() )
         timer->Stop();


@@ -52,7 +43,8 @@ static pascal void wxProcessTimer( EventLoopTimerRef theTimer, void *data )
     timer->Notify();
 }
 
     timer->Notify();
 }
 

-void wxTimer::Init()
+wxCarbonTimerImpl::wxCarbonTimerImpl(wxTimer *timer)
+                 : wxTimerImpl(timer)

 {
     m_info = new MacTimerInfo();
     m_info->m_timer = this;
 {
     m_info = new MacTimerInfo();
     m_info->m_timer = this;


@@ -60,24 +52,19 @@ void wxTimer::Init()
     m_info->m_timerRef = kInvalidID;
 }
 
     m_info->m_timerRef = kInvalidID;
 }
 

-bool wxTimer::IsRunning() const
+bool wxCarbonTimerImpl::IsRunning() const

 {
     return ( m_info->m_timerRef != kInvalidID );
 }
 
 {
     return ( m_info->m_timerRef != kInvalidID );
 }
 

-wxTimer::~wxTimer()
+wxCarbonTimerImpl::~wxCarbonTimerImpl()

 {
 {

-    Stop();
-    if (m_info != NULL)
-    {
-        delete m_info;
-        m_info = NULL;
-    }
+    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 timeout") );
     wxCHECK_MSG( m_info->m_timerRef == 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") );


@@ -97,7 +84,7 @@ bool wxTimer::Start( int milliseconds, bool mode )
     return true;
 }
 
     return true;
 }
 

-void wxTimer::Stop()
+void wxCarbonTimerImpl::Stop()

 {
     if (m_info->m_timerRef)
         RemoveEventLoopTimer( m_info->m_timerRef );
 {
     if (m_info->m_timerRef)
         RemoveEventLoopTimer( m_info->m_timerRef );


@@ -108,111 +95,5 @@ void wxTimer::Stop()
     m_info->m_timerRef = kInvalidID;
 }
 
     m_info->m_timerRef = kInvalidID;
 }
 

-#else
-
-typedef struct MacTimerInfo
-{
-    TMTask m_task;
-    wxMacNotifierTableRef m_table;
-    wxTimer* m_timer;
-};
-
-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 );
-}
-
-// we need this array to track timers that are being deleted within the Notify procedure
-// adding the timer before the Notify call and checking after whether it still is in there
-// as the destructor would have removed it from the array
-
-wxArrayPtrVoid gTimersInProcess;
+#endif // wxUSE_TIMER

 
 

-static void wxProcessTimer( unsigned long event, void *data )
-{
-    if ( data == NULL )
-        return;
-
-    wxTimer* timer = (wxTimer*) data;
-    if ( timer->IsOneShot() )
-        timer->Stop();
-
-    gTimersInProcess.Add( timer );
-    timer->Notify();
-
-    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() );
-    }
-}
-
-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;
-}
-
-bool wxTimer::IsRunning() const
-{
-    // as the qType may already indicate it is elapsed, but it
-    // was not handled internally yet
-    return ( m_info->m_task.tmAddr != NULL );
-}
-
-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 )
-{
-    (void)wxTimerBase::Start( milliseconds, mode );
-
-    wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeout") );
-    wxCHECK_MSG( m_info->m_task.tmAddr == NULL, false, wxT("attempting to restart a timer") );
-
-    m_info->m_task.tmAddr = NewTimerUPP( MacTimerProc );
-    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;
-}
-
-void wxTimer::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 );
-}
-
-#endif