don't use -q option with egrep, Solaris doesn't have it (bug 517145)

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index ca8a477d356b1f20e3c3d7fb1859a5ea1c0167a0..a8514f8cd169098e08cfc5694cc2b6b332396a63 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        timer.cpp
-// Purpose:
+// Name:        gtk/timer.cpp
+// Purpose:     wxTimer implementation

 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling


@@ -12,78 +12,33 @@
 #pragma implementation "timer.h"
 #endif
 
 #pragma implementation "timer.h"
 #endif
 

-#include "wx/timer.h"
-
-#include "gtk/gtk.h"
-/*
-#include "glib.h"
-*/
-
-//-----------------------------------------------------------------------------
-// global functions
-//-----------------------------------------------------------------------------
-
-/*
-static GTimer *g_timer = (GTimer*) NULL;
-
-void wxStartTimer()
-{
-    if (g_timer)
-    {
-        g_timer_rest( g_timer );
-    }
-    else
-    {
-        g_timer = g_timer_new();
-        g_timer_start( g_timer );
-    }
-}
-
-long wxGetElapsedTime( bool resetTimer )
-{
-    gulong res = 0;
-    if (g_timer)
-    {
-        g_timer_elapsed( g_timer, &res );
-        if (resetTimer) g_timer_reset( g_timer );
-    }
-
-    return res;
-}
+#include "wx/defs.h"

 
 

-bool wxGetLocalTime( long *timeZone, int *dstObserved )
-{
-}
+#if wxUSE_TIMER

 
 

-long wxGetCurrentTime()
-{
-}
-*/
+#include "wx/timer.h"

 
 

+#include "gtk/gtk.h"

 
 

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxTimer
 // wxTimer

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)

 
 

-static gint timeout_callback( gpointer data )
+extern "C" gint timeout_callback( gpointer data )

 {
     wxTimer *timer = (wxTimer*)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 */
     /* 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
+    gdk_threads_enter();

 
     timer->Notify();
 
 
     timer->Notify();
 

-#if (GTK_MINOR_VERSION > 0)

     /* release lock again */
     /* release lock again */

-    GDK_THREADS_LEAVE ();
-#endif
+    gdk_threads_leave();

 
     if ( timer->IsOneShot() )
         return FALSE;
 
     if ( timer->IsOneShot() )
         return FALSE;


@@ -91,11 +46,10 @@ static gint timeout_callback( gpointer data )
     return TRUE;
 }
 
     return TRUE;
 }
 

-wxTimer::wxTimer()
+void wxTimer::Init()

 {
     m_tag = -1;
     m_milli = 1000;
 {
     m_tag = -1;
     m_milli = 1000;

-    m_oneShot = FALSE;

 }
 
 wxTimer::~wxTimer()
 }
 
 wxTimer::~wxTimer()


@@ -107,6 +61,9 @@ bool wxTimer::Start( int millisecs, bool oneShot )
 {
     (void)wxTimerBase::Start(millisecs, 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;
     m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
 
     return TRUE;


@@ -121,3 +78,5 @@ void wxTimer::Stop()
     }
 }
 
     }
 }
 

+#endif // wxUSE_TIMER
+