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

survive delete within Notify

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-05-21 20:45:44 +00:00
parent fd4393b845
commit e5f0419b0d
2 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
#include <Timer.h> #include <Timer.h>
#endif #endif
#include "wx/dynarray.h"
typedef struct MacTimerInfo typedef struct MacTimerInfo
{ {
TMTask m_task; TMTask m_task;
@@ -41,20 +43,33 @@ static pascal void MacTimerProc( TMTask * t )
wxMacAddEvent( tm->m_table , wxProcessTimer, 0 , (void*) tm->m_timer , TRUE ) ; wxMacAddEvent( tm->m_table , wxProcessTimer, 0 , (void*) tm->m_timer , TRUE ) ;
} }
wxArrayPtrVoid gTimersInProcess ;
static void wxProcessTimer( unsigned long event , void *data ) static void wxProcessTimer( unsigned long event , void *data )
{ {
if ( !data ) if ( !data )
return ; return ;
wxTimer* timer = (wxTimer*) data ; wxTimer* timer = (wxTimer*) data ;
if ( timer->IsOneShot() ) if ( timer->IsOneShot() )
timer->Stop() ; timer->Stop() ;
gTimersInProcess.Add( timer ) ;
timer->Notify(); timer->Notify();
if ( timer->m_info->m_task.tmAddr && !timer->IsOneShot() ) int index = gTimersInProcess.Index( timer ) ;
if ( index != wxNOT_FOUND )
{ {
PrimeTime( (QElemPtr) &timer->m_info->m_task , timer->GetInterval() ) ; gTimersInProcess.RemoveAt( index ) ;
if ( !timer->IsOneShot() && timer->m_info->m_task.tmAddr )
{
PrimeTime( (QElemPtr) &timer->m_info->m_task , timer->GetInterval() ) ;
}
} }
} }
@@ -79,6 +94,9 @@ wxTimer::~wxTimer()
Stop(); Stop();
delete m_info ; delete m_info ;
m_info = NULL ; m_info = NULL ;
int index = gTimersInProcess.Index( this ) ;
if ( index != wxNOT_FOUND )
gTimersInProcess.RemoveAt( index ) ;
} }
bool wxTimer::Start(int milliseconds,bool mode) bool wxTimer::Start(int milliseconds,bool mode)

22
src/mac/timer.cpp
View File

@@ -26,6 +26,8 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
#include <Timer.h> #include <Timer.h>
#endif #endif
#include "wx/dynarray.h"
typedef struct MacTimerInfo typedef struct MacTimerInfo
{ {
TMTask m_task; TMTask m_task;
@@ -41,20 +43,33 @@ static pascal void MacTimerProc( TMTask * t )
wxMacAddEvent( tm->m_table , wxProcessTimer, 0 , (void*) tm->m_timer , TRUE ) ; wxMacAddEvent( tm->m_table , wxProcessTimer, 0 , (void*) tm->m_timer , TRUE ) ;
} }
wxArrayPtrVoid gTimersInProcess ;
static void wxProcessTimer( unsigned long event , void *data ) static void wxProcessTimer( unsigned long event , void *data )
{ {
if ( !data ) if ( !data )
return ; return ;
wxTimer* timer = (wxTimer*) data ; wxTimer* timer = (wxTimer*) data ;
if ( timer->IsOneShot() ) if ( timer->IsOneShot() )
timer->Stop() ; timer->Stop() ;
gTimersInProcess.Add( timer ) ;
timer->Notify(); timer->Notify();
if ( timer->m_info->m_task.tmAddr && !timer->IsOneShot() ) int index = gTimersInProcess.Index( timer ) ;
if ( index != wxNOT_FOUND )
{ {
PrimeTime( (QElemPtr) &timer->m_info->m_task , timer->GetInterval() ) ; gTimersInProcess.RemoveAt( index ) ;
if ( !timer->IsOneShot() && timer->m_info->m_task.tmAddr )
{
PrimeTime( (QElemPtr) &timer->m_info->m_task , timer->GetInterval() ) ;
}
} }
} }
@@ -79,6 +94,9 @@ wxTimer::~wxTimer()
Stop(); Stop();
delete m_info ; delete m_info ;
m_info = NULL ; m_info = NULL ;
int index = gTimersInProcess.Index( this ) ;
if ( index != wxNOT_FOUND )
gTimersInProcess.RemoveAt( index ) ;
} }
bool wxTimer::Start(int milliseconds,bool mode) bool wxTimer::Start(int milliseconds,bool mode)