// 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 <gtk/gtk.h>
// ----------------------------------------------------------------------------
-// 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;
- /* 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 */
+ 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.
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();
-}
+ if ( !wxTimerImpl::Start(millisecs, oneShot) )
+ return false;
-bool wxTimer::Start( int millisecs, bool oneShot )
-{
- (void)wxTimerBase::Start(millisecs, oneShot);
+ wxASSERT_MSG( !m_sourceId, _T("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, _T("should be running") );
+
+ g_source_remove(m_sourceId);
+ m_sourceId = 0;
}
#endif // wxUSE_TIMER