don't use a floating point value as a boolean flag; gcc4 (correctly) complains when it's compared with 0; use different function for setting the current and given time in wxMacCarbonEvent instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
355b4d3de5
commit
2c01d33555
@ -335,9 +335,13 @@ public :
|
||||
{
|
||||
return EventTimeToTicks( GetTime() ) ;
|
||||
}
|
||||
OSStatus SetTime( EventTime inWhen = 0 /*now*/ )
|
||||
OSStatus SetCurrentTime( )
|
||||
{
|
||||
return ::SetEventTime( m_eventRef , inWhen ? inWhen : GetCurrentEventTime() ) ;
|
||||
return ::SetEventTime( m_eventRef , GetCurrentEventTime() ) ;
|
||||
}
|
||||
OSStatus SetTime( EventTime when )
|
||||
{
|
||||
return ::SetEventTime( m_eventRef , when ) ;
|
||||
}
|
||||
operator EventRef () { return m_eventRef; }
|
||||
|
||||
|
@ -746,7 +746,7 @@ void wxMacWakeUp()
|
||||
{
|
||||
if ( IsEventInQueue( GetMainEventQueue() , s_wakeupEvent ) )
|
||||
return ;
|
||||
s_wakeupEvent.SetTime(0) ;
|
||||
s_wakeupEvent.SetCurrentTime() ;
|
||||
err = PostEventToQueue(GetMainEventQueue(), s_wakeupEvent,
|
||||
kEventPriorityHigh);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user