cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added comment about array, switched intepretation of IsRunning to MSW meaning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2004-03-03 07:17:32 +00:00
parent e1293dcf96
commit 604b66c10b
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mac/carbon/timer.cpp
View File

@ -43,6 +43,10 @@ static pascal void MacTimerProc( TMTask * 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 ;
static void wxProcessTimer( unsigned long event , void *data )
@ -86,7 +90,9 @@ void wxTimer::Init()
bool wxTimer::IsRunning() const
{
return ( m_info->m_task.qType & kTMTaskActive ) ;
// 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()
@ -105,7 +111,7 @@ bool wxTimer::Start(int milliseconds,bool mode)
{
(void)wxTimerBase::Start(milliseconds, mode);
wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeour") );
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") );
#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)

10
src/mac/timer.cpp
View File

@ -43,6 +43,10 @@ static pascal void MacTimerProc( TMTask * 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 ;
static void wxProcessTimer( unsigned long event , void *data )
@ -86,7 +90,9 @@ void wxTimer::Init()
bool wxTimer::IsRunning() const
{
return ( m_info->m_task.qType & kTMTaskActive ) ;
// 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()
@ -105,7 +111,7 @@ bool wxTimer::Start(int milliseconds,bool mode)
{
(void)wxTimerBase::Start(milliseconds, mode);
wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeour") );
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") );
#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)