// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "timer.h"
#endif
+#include "wx/wxprec.h"
+
#include "wx/timer.h"
-#if !USE_SHARED_LIBRARY
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-#endif
#ifdef __WXMAC__
#include "wx/mac/private.h"
#if wxMAC_USE_CARBON_TIMER
-typedef struct MacTimerInfo
+struct MacTimerInfo
{
wxTimer* m_timer ;
EventLoopTimerUPP m_proc ;
{
if ( !data )
return ;
-
+
wxTimer* timer = (wxTimer*) data ;
-
+
if ( timer->IsOneShot() )
timer->Stop() ;
m_info->m_timerRef = kInvalidID ;
}
-bool wxTimer::IsRunning() const
+bool wxTimer::IsRunning() const
{
return ( m_info->m_timerRef != kInvalidID ) ;
}
{
(void)wxTimerBase::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") );
m_info->m_timer = this ;
m_info->m_proc = NewEventLoopTimerUPP( &wxProcessTimer);
m_info->m_proc,
this,
&m_info->m_timerRef) ) ;
- return TRUE;
+ return true;
}
void wxTimer::Stop()
{
if (m_info->m_timerRef)
- RemoveEventLoopTimer( m_info->m_timerRef ) ;
+ RemoveEventLoopTimer( m_info->m_timerRef ) ;
if (m_info->m_proc)
DisposeEventLoopTimerUPP(m_info->m_proc) ;
m_info->m_proc = NULL ;
}
// 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
+// 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 ;
{
if ( !data )
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() ) ;
}
-
+
}
}
m_info->m_timer = this ;
}
-bool wxTimer::IsRunning() const
+bool wxTimer::IsRunning() const
{
// as the qType may already indicate it is elapsed, but it
// was not handled internally yet
}
int index = gTimersInProcess.Index( this ) ;
if ( index != wxNOT_FOUND )
- gTimersInProcess.RemoveAt( index ) ;
+ 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") );
+ 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_timer = this ;
InsXTime((QElemPtr) &m_info->m_task ) ;
PrimeTime( (QElemPtr) &m_info->m_task , m_milli ) ;
- return TRUE;
+ return true;
}
void wxTimer::Stop()