Stop using deprecated CFAbsoluteTimeAddGregorianUnits()
since we are still working in seconds, the replacement is rather simple
This commit is contained in:
committed by
Vadim Zeitlin
parent
582876f616
commit
19b875830b
@@ -69,10 +69,6 @@ bool wxOSXTimerImpl::Start( int milliseconds, bool mode )
|
|||||||
wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeout") );
|
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_info->m_timerRef == NULL, false, wxT("attempting to restart a timer") );
|
||||||
|
|
||||||
CFGregorianUnits gumilli ;
|
|
||||||
memset(&gumilli,0,sizeof(gumilli) );
|
|
||||||
gumilli.seconds = m_milli / 1000.0;
|
|
||||||
|
|
||||||
CFRunLoopTimerContext ctx ;
|
CFRunLoopTimerContext ctx ;
|
||||||
memset( &ctx, 0 , sizeof(ctx) );
|
memset( &ctx, 0 , sizeof(ctx) );
|
||||||
ctx.version = 0;
|
ctx.version = 0;
|
||||||
@@ -80,8 +76,7 @@ bool wxOSXTimerImpl::Start( int milliseconds, bool mode )
|
|||||||
|
|
||||||
m_info->m_timer = this;
|
m_info->m_timer = this;
|
||||||
m_info->m_timerRef = CFRunLoopTimerCreate(
|
m_info->m_timerRef = CFRunLoopTimerCreate(
|
||||||
kCFAllocatorDefault,
|
kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + m_milli / 1000.0,
|
||||||
CFAbsoluteTimeAddGregorianUnits( CFAbsoluteTimeGetCurrent() , NULL, gumilli ),
|
|
||||||
IsOneShot() ? 0 : CFTimeInterval( m_milli / 1000.0 ) ,
|
IsOneShot() ? 0 : CFTimeInterval( m_milli / 1000.0 ) ,
|
||||||
0, 0, wxProcessTimer, &ctx);
|
0, 0, wxProcessTimer, &ctx);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user