X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b90a8f20dd9c1a478f755941795158c38230a80..ee3510132b8b4160f848bd4f502a6f5315f90dbc:/src/gtk1/timer.cpp diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp index a1a8a8126a..a8514f8cd1 100644 --- a/src/gtk1/timer.cpp +++ b/src/gtk1/timer.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: timer.cpp -// Purpose: +// Name: gtk/timer.cpp +// Purpose: wxTimer implementation // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,96 +12,59 @@ #pragma implementation "timer.h" #endif -#include "wx/timer.h" - -#include "gtk/gtk.h" -/* -#include "glib.h" -*/ +#include "wx/defs.h" -//----------------------------------------------------------------------------- -// global functions -//----------------------------------------------------------------------------- +#if wxUSE_TIMER -/* -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() -{ -} -*/ +#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; + + /* 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 (timer->OneShot()) - { - timer->Stop(); - } + /* release lock again */ + gdk_threads_leave(); + + 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; } @@ -115,3 +78,5 @@ void wxTimer::Stop() } } +#endif // wxUSE_TIMER +