regenerated after wxSelectDispatcher addition (patch 1618976)

[wxWidgets.git] / src / gtk / timer.cpp

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index f87bffa62bbb1d36ce5a9f5a4c7bb35d8f5caa57..7bb0317952ef23068addc4b1700cae8a5b20b0e0 100644 (file)
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -1,71 +1,85 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        timer.cpp
-// Purpose:
+// Name:        gtk/timer.cpp
+// Purpose:     wxTimer implementation

 // Author:      Robert Roebling
 // 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 "wx/timer.h"
 

-//-----------------------------------------------------------------------------
+#include <gtk/gtk.h>
+
+// ----------------------------------------------------------------------------

 // wxTimer
 // wxTimer

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxTimer,wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)

 
 

-gint timeout_callback( gpointer data )
+extern "C" {
+static gboolean timeout_callback(gpointer data)

 {
 {

-  wxTimer *timer = (wxTimer*)data;
-  timer->Notify();
-  if (timer->OneShot()) timer->Stop();
-  return TRUE;
-};
+    wxTimer *timer = (wxTimer*)data;

 
 

-wxTimer::wxTimer(void)
-{
-  m_tag = -1;
-  m_time = 1000;
-  m_oneShot = FALSE;
-};
+    // Don't change the order of anything in this callback!

 
 

-wxTimer::~wxTimer(void)
-{
-  Stop();
-};
+    if (timer->IsOneShot())
+    {
+        // This sets m_tag to -1
+        timer->Stop();
+    }

 
 

-int wxTimer::Interval(void)
-{
-  return m_time;
-};
+    // 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();

 
 

-bool wxTimer::OneShot(void)
+    return !timer->IsOneShot();
+}
+}
+
+void wxTimer::Init()

 {
 {

-  return m_oneShot;
-};
+    m_sourceId = 0;
+    m_milli = 1000;
+}

 
 

-void wxTimer::Notify(void)
+wxTimer::~wxTimer()

 {
 {

-};
+    Stop();
+}

 
 

-void wxTimer::Start( int millisecs, bool oneShot )
+bool wxTimer::Start( int millisecs, bool oneShot )

 {
 {

-  if (millisecs != -1) m_time = millisecs;
-  m_oneShot = oneShot;
-  m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
-};
+    (void)wxTimerBase::Start(millisecs, oneShot);
+
+    if (m_sourceId != 0)
+        g_source_remove(m_sourceId);
+
+    m_sourceId = g_timeout_add(m_milli, timeout_callback, this);

 
 

-void wxTimer::Stop(void)
+    return true;
+}
+
+void wxTimer::Stop()

 {
 {

-  if (m_tag != -1)
-    gtk_timeout_remove( m_tag );
-  m_tag = -1;
-};
+    if (m_sourceId != 0)
+    {
+        g_source_remove(m_sourceId);
+        m_sourceId = 0;
+    }
+}
+
+#endif // wxUSE_TIMER