X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/313feadc84cdf5501da71c41178c35bb7bed32eb..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/gtk/timer.cpp diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp index 3b28f1d1c2..8f9fd46dc0 100644 --- a/src/gtk/timer.cpp +++ b/src/gtk/timer.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/timer.cpp +// Name: src/gtk/timer.cpp // Purpose: wxTimer implementation // Author: Robert Roebling // Id: $Id$ @@ -7,38 +7,30 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "timer.h" -#endif - // 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, wxEvtHandler) +extern "C" { -extern "C" gint timeout_callback( gpointer data ) +static gboolean timeout_callback(gpointer data) { - wxTimer *timer = (wxTimer*)data; + wxGTKTimerImpl *timer = (wxGTKTimerImpl*)data; - // Don't change the order of anything in this callback! - - if (timer->IsOneShot()) - { - // This sets m_tag to -1 + 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. @@ -49,42 +41,33 @@ extern "C" gint timeout_callback( gpointer data ) // 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