moved Esc processing from wxWindow to wxDialog where it belongs; use the -- to be...

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

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index 89ecf05f6d2fdca9f67d59b672b5273be9691ee3..e004d2d4bea293908db6fb21824c1f23a1ead528 100644 (file)
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -1,67 +1,93 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.cpp
-// Purpose:
+// Name:        gtk/timer.cpp
+// Purpose:     wxTimer implementation
 // Author:      Robert Roebling
-// Id:          $id$
+// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifdef __GNUG__
+#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 "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
+