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

fix from Ron for one-shot timers

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/timer.cpp
View File

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

6
src/gtk1/timer.cpp
View File

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