regenerated from template

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index ac5b34cb14df7cb5eed87dbedf88566b9880d989..175c92aa12168af15f1b170d51d12b7eeef18c67 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -15,51 +15,6 @@
 #include "wx/timer.h"
 
 #include "gtk/gtk.h"
 #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;
-}
-
-bool wxGetLocalTime( long *timeZone, int *dstObserved )
-{
-}
-
-long wxGetCurrentTime()
-{
-}
-*/
-

 
 //-----------------------------------------------------------------------------
 // wxTimer
 
 //-----------------------------------------------------------------------------
 // wxTimer


@@ -71,21 +26,17 @@ static 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->OneShot())
+    if ( timer->IsOneShot() )

         return FALSE;
 
     return TRUE;
         return FALSE;
 
     return TRUE;


@@ -94,25 +45,20 @@ static gint timeout_callback( gpointer data )
 wxTimer::wxTimer()
 {
     m_tag = -1;
 wxTimer::wxTimer()
 {
     m_tag = -1;

-    m_time = 1000;
+    m_milli = 1000;

     m_oneShot = FALSE;
 }
 
 wxTimer::~wxTimer()
 {
     m_oneShot = FALSE;
 }
 
 wxTimer::~wxTimer()
 {

-    Stop();
+    wxTimer::Stop();

 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {

-    if (millisecs != -1)
-    {
-        m_time = millisecs;
-    }
-
-    m_oneShot = oneShot;
+    (void)wxTimerBase::Start(millisecs, oneShot);

 
 

-    m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+    m_tag = gtk_timeout_add( m_milli, timeout_callback, this );

 
     return TRUE;
 }
 
     return TRUE;
 }