X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1393d82b33b1bb838474971618e8bbb3643dc64..1978421a6d8b81c1f8a961da4b8ddf544fec7b1b:/src/gtk/timer.cpp?ds=inline diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp index ac5b34cb14..0353bede8b 100644 --- a/src/gtk/timer.cpp +++ b/src/gtk/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 @@ -8,111 +8,72 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "timer.h" #endif -#include "wx/timer.h" - -#include "gtk/gtk.h" -/* -#include "glib.h" -*/ - -//----------------------------------------------------------------------------- -// global functions -//----------------------------------------------------------------------------- - -/* -static GTimer *g_timer = (GTimer*) NULL; +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -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; -} +#if wxUSE_TIMER -bool wxGetLocalTime( long *timeZone, int *dstObserved ) -{ -} - -long wxGetCurrentTime() -{ -} -*/ +#include "wx/timer.h" +#include "gtk/gtk.h" -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // 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; -#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 + // Don't change the order of anything in this callback! + + if (timer->IsOneShot()) + { + // This sets m_tag to -1 + timer->Stop(); + } + + // 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(); timer->Notify(); -#if (GTK_MINOR_VERSION > 0) - /* release lock again */ - GDK_THREADS_LEAVE (); -#endif + // Release lock again. + 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; - } + (void)wxTimerBase::Start(millisecs, oneShot); - m_oneShot = oneShot; + if (m_tag != -1) + gtk_timeout_remove( m_tag ); - m_tag = gtk_timeout_add( millisecs, timeout_callback, this ); + m_tag = gtk_timeout_add( m_milli, timeout_callback, this ); return TRUE; } @@ -126,3 +87,5 @@ void wxTimer::Stop() } } +#endif // wxUSE_TIMER +