X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1393d82b33b1bb838474971618e8bbb3643dc64..1f80a703f24bc50a5ce92fb1406dd1b38ac4e506:/src/gtk/timer.cpp diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp index ac5b34cb14..ab9e368931 100644 --- a/src/gtk/timer.cpp +++ b/src/gtk/timer.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: timer.cpp +// Name: gtk/timer.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -15,51 +15,6 @@ #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 @@ -71,48 +26,38 @@ 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 + gdk_threads_enter(); timer->Notify(); -#if (GTK_MINOR_VERSION > 0) /* release lock again */ - GDK_THREADS_LEAVE (); -#endif + gdk_threads_leave(); - if (timer->OneShot()) + if ( timer->IsOneShot() ) return FALSE; return TRUE; } -wxTimer::wxTimer() +void wxTimer::Init() { m_tag = -1; - m_time = 1000; - m_oneShot = FALSE; + m_milli = 1000; } wxTimer::~wxTimer() { - Stop(); + wxTimer::Stop(); } 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; }