silently ignore any X-fields in mime.types

[wxWidgets.git] / src / gtk1 / timer.cpp

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index f8531ba81c3ffe82d0142ec5c83ef1a20080cd9b..a8514f8cd169098e08cfc5694cc2b6b332396a63 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -26,7 +26,7 @@
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
 
-static gint timeout_callback( gpointer data )
+extern "C" gint timeout_callback( gpointer data )
 {
     wxTimer *timer = (wxTimer*)data;
 
@@ -61,6 +61,9 @@ bool wxTimer::Start( int millisecs, bool oneShot )
 {
     (void)wxTimerBase::Start(millisecs, oneShot);
 
+    if (m_tag != -1)
+        gtk_timeout_remove( m_tag );
+
     m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
 
     return TRUE;