From e1393d82b33b1bb838474971618e8bbb3643dc64 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 1 Oct 1999 13:21:34 +0000
Subject: [PATCH] fix from Ron for one-shot timers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/timer.cpp  | 12 ++++++------
 src/gtk1/timer.cpp | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index a27905231d..ac5b34cb14 100644
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -45,9 +45,9 @@ 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;
 }
 
@@ -70,14 +70,14 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
 static gint timeout_callback( gpointer data )
 {
     wxTimer *timer = (wxTimer*)data;
-    
+
 #if (GTK_MINOR_VERSION > 0)
     /* when getting called from GDK's timer handler we
        are no longer within GDK's grab on the GUI
        thread so we must lock it here ourselves */
     GDK_THREADS_ENTER ();
 #endif
-    
+
     timer->Notify();
 
 #if (GTK_MINOR_VERSION > 0)
@@ -86,7 +86,7 @@ static gint timeout_callback( gpointer data )
 #endif
 
     if (timer->OneShot())
-        timer->Stop();
+        return FALSE;
 
     return TRUE;
 }
diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index a27905231d..ac5b34cb14 100644
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -45,9 +45,9 @@ 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;
 }
 
@@ -70,14 +70,14 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
 static gint timeout_callback( gpointer data )
 {
     wxTimer *timer = (wxTimer*)data;
-    
+
 #if (GTK_MINOR_VERSION > 0)
     /* when getting called from GDK's timer handler we
        are no longer within GDK's grab on the GUI
        thread so we must lock it here ourselves */
     GDK_THREADS_ENTER ();
 #endif
-    
+
     timer->Notify();
 
 #if (GTK_MINOR_VERSION > 0)
@@ -86,7 +86,7 @@ static gint timeout_callback( gpointer data )
 #endif
 
     if (timer->OneShot())
-        timer->Stop();
+        return FALSE;
 
     return TRUE;
 }
-- 
2.45.2