X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/574bf5078506e4788ba94c07571421b20c0e2716..11a23db53128bf244a089123b7fd27deb577a889:/src/gtk/timer.cpp diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp index 2afdb78df9..5e819097eb 100644 --- a/src/gtk/timer.cpp +++ b/src/gtk/timer.cpp @@ -1,81 +1,72 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/timer.cpp +// Name: src/gtk/timer.cpp // Purpose: wxTimer implementation // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#ifdef __GNUG__ -#pragma implementation "timer.h" -#endif - -#include "wx/defs.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_TIMER -#include "wx/timer.h" +#include "wx/gtk/private/timer.h" +#include "wx/app.h" -#include "gtk/gtk.h" +#include // ---------------------------------------------------------------------------- -// wxTimer +// wxTimerImpl // ---------------------------------------------------------------------------- -IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) +extern "C" { -static gint timeout_callback( gpointer data ) +static gboolean timeout_callback(gpointer data) { - wxTimer *timer = (wxTimer*)data; + wxGTKTimerImpl *timer = (wxGTKTimerImpl*)data; + + const bool keepGoing = !timer->IsOneShot(); + if ( !keepGoing ) + 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 */ + // 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(); - /* release lock again */ + // Release lock again. gdk_threads_leave(); - if ( timer->IsOneShot() ) - return FALSE; + wxApp* app = wxTheApp; + if (app) + app->WakeUpIdle(); - return TRUE; + return keepGoing; } -void wxTimer::Init() -{ - m_tag = -1; - m_milli = 1000; -} +} // extern "C" -wxTimer::~wxTimer() +bool wxGTKTimerImpl::Start(int millisecs, bool oneShot) { - wxTimer::Stop(); -} - -bool wxTimer::Start( int millisecs, bool oneShot ) -{ - (void)wxTimerBase::Start(millisecs, oneShot); + if ( !wxTimerImpl::Start(millisecs, oneShot) ) + return false; - if (m_tag != -1) - gtk_timeout_remove( m_tag ); + wxASSERT_MSG( !m_sourceId, wxT("shouldn't be still running") ); - m_tag = gtk_timeout_add( m_milli, timeout_callback, this ); + m_sourceId = g_timeout_add(m_milli, timeout_callback, this); - return TRUE; + return true; } -void wxTimer::Stop() +void wxGTKTimerImpl::Stop() { - if (m_tag != -1) - { - gtk_timeout_remove( m_tag ); - m_tag = -1; - } + wxASSERT_MSG( m_sourceId, wxT("should be running") ); + + g_source_remove(m_sourceId); + m_sourceId = 0; } #endif // wxUSE_TIMER