/////////////////////////////////////////////////////////////////////////////
-// Name: timer.cpp
-// Purpose:
+// Name: gtk/timer.cpp
+// Purpose: wxTimer implementation
// Author: Robert Roebling
-// Created: 01/02/97
-// Id:
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence: wxWindows licence
+// Id: $Id$
+// Copyright: (c) 1998 Robert Roebling
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#ifdef __GNUG__
-#pragma implementation "timer.h"
-#endif
+#if wxUSE_TIMER
#include "wx/timer.h"
-//-----------------------------------------------------------------------------
+#include "gtk/gtk.h"
+
+// ----------------------------------------------------------------------------
// wxTimer
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-gint timeout_callback( gpointer data )
+extern "C" {
+static gint timeout_callback( gpointer data )
{
- wxTimer *timer = (wxTimer*)data;
- timer->Notify();
-
- if ( timer->OneShot() )
- timer->Stop();
-
- return TRUE;
+ wxTimer *timer = (wxTimer*)data;
+
+ // Don't change the order of anything in this callback!
+
+ if (timer->IsOneShot())
+ {
+ // This sets m_tag to -1
+ 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.
+ 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_tag = -1;
+ 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;
+ return TRUE;
}
void wxTimer::Stop()
{
- if ( m_tag != -1 )
- {
- gtk_timeout_remove( m_tag );
-
- m_tag = -1;
- }
+ if (m_tag != -1)
+ {
+ gtk_timeout_remove( m_tag );
+ m_tag = -1;
+ }
}
+#endif // wxUSE_TIMER
+