fix from Ron for one-shot timers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-10-01 13:21:34 +00:00
parent 5427610e6b
commit e1393d82b3
2 changed files with 12 additions and 12 deletions

View File

@@ -4,7 +4,7 @@
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -45,7 +45,7 @@ long wxGetElapsedTime( bool resetTimer )
if (g_timer)
{
g_timer_elapsed( g_timer, &res );
if (resetTimer) g_timer_reset( g_timer );
if (resetTimer) g_timer_reset( g_timer );
}
return res;
@@ -86,7 +86,7 @@ static gint timeout_callback( gpointer data )
#endif
if (timer->OneShot())
timer->Stop();
return FALSE;
return TRUE;
}

View File

@@ -4,7 +4,7 @@
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -45,7 +45,7 @@ long wxGetElapsedTime( bool resetTimer )
if (g_timer)
{
g_timer_elapsed( g_timer, &res );
if (resetTimer) g_timer_reset( g_timer );
if (resetTimer) g_timer_reset( g_timer );
}
return res;
@@ -86,7 +86,7 @@ static gint timeout_callback( gpointer data )
#endif
if (timer->OneShot())
timer->Stop();
return FALSE;
return TRUE;
}