regenerated from template

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index 61de7eeb1116a45720ee69eb3f1d52792a40683d..175c92aa12168af15f1b170d51d12b7eeef18c67 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -14,54 +14,61 @@
 
 #include "wx/timer.h"
 
 
 #include "wx/timer.h"
 

+#include "gtk/gtk.h"
+

 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
 
 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
 

-gint timeout_callback( gpointer data )
+static gint timeout_callback( gpointer data )

 {
 {

-  wxTimer *timer = (wxTimer*)data;
-  timer->Notify();
+    wxTimer *timer = (wxTimer*)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 */
+    gdk_threads_enter();
+
+    timer->Notify();
+
+    /* release lock again */
+    gdk_threads_leave();

 
 

-  if ( timer->OneShot() )
-    timer->Stop();
+    if ( timer->IsOneShot() )
+        return FALSE;

 
 

-  return TRUE;
+    return TRUE;

 }
 
 wxTimer::wxTimer()
 {
 }
 
 wxTimer::wxTimer()
 {

-  m_tag = -1;
-  m_time = 1000;
-  m_oneShot = FALSE;
+    m_tag = -1;
+    m_milli = 1000;
+    m_oneShot = FALSE;

 }
 
 wxTimer::~wxTimer()
 {
 }
 
 wxTimer::~wxTimer()
 {

-  Stop();
+    wxTimer::Stop();

 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {

-  if ( millisecs != -1 )
-    m_time = millisecs;
-
-  m_oneShot = oneShot;
+    (void)wxTimerBase::Start(millisecs, oneShot);

 
 

-  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()
 {
 }
 
 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;
+    }

 }
 
 }