X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83624f79609f0d5e240c1f7d77d044bfff9702fc..1f80a703f24bc50a5ce92fb1406dd1b38ac4e506:/src/gtk/timer.cpp diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp index 36aada6e6f..ab9e368931 100644 --- a/src/gtk/timer.cpp +++ b/src/gtk/timer.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: timer.cpp +// Name: gtk/timer.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,41 +22,42 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject) -gint timeout_callback( gpointer data ) +static 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; - } - - 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; }