Squashed another threading and interpreter lock bug

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index cf9d2c64a3ac5a34010b879749ba99b6c284984c..ac5b34cb14df7cb5eed87dbedf88566b9880d989 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -2,10 +2,9 @@
 // Name:        timer.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        timer.cpp
 // Purpose:
 // 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

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


@@ -15,57 +14,115 @@
 
 #include "wx/timer.h"
 
 
 #include "wx/timer.h"
 

+#include "gtk/gtk.h"
+/*
+#include "glib.h"
+*/
+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// wxTimer
+// global functions

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxTimer,wxObject)
+/*
+static GTimer *g_timer = (GTimer*) NULL;
+
+void wxStartTimer()
+{
+    if (g_timer)
+    {
+        g_timer_rest( g_timer );
+    }
+    else
+    {
+        g_timer = g_timer_new();
+        g_timer_start( g_timer );
+    }
+}

 
 

-gint timeout_callback( gpointer data )
+long wxGetElapsedTime( bool resetTimer )

 {
 {

-  wxTimer *timer = (wxTimer*)data;
-  timer->Notify();
-  if (timer->OneShot()) timer->Stop();
-  return TRUE;
+    gulong res = 0;
+    if (g_timer)
+    {
+        g_timer_elapsed( g_timer, &res );
+        if (resetTimer) g_timer_reset( g_timer );
+    }
+
+    return res;

 }
 
 }
 

-wxTimer::wxTimer(void)
+bool wxGetLocalTime( long *timeZone, int *dstObserved )

 {
 {

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

 }
 
 }
 

-wxTimer::~wxTimer(void)
+long wxGetCurrentTime()

 {
 {

-  Stop();

 }
 }

+*/
+
+
+//-----------------------------------------------------------------------------
+// wxTimer
+//-----------------------------------------------------------------------------

 
 

-int wxTimer::Interval(void)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
+
+static gint timeout_callback( gpointer data )

 {
 {

-  return m_time;
+    wxTimer *timer = (wxTimer*)data;
+
+#if (GTK_MINOR_VERSION > 0)
+    /* 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 ();
+#endif
+
+    timer->Notify();
+
+#if (GTK_MINOR_VERSION > 0)
+    /* release lock again */
+    GDK_THREADS_LEAVE ();
+#endif
+
+    if (timer->OneShot())
+        return FALSE;
+
+    return TRUE;

 }
 
 }
 

-bool wxTimer::OneShot(void)
+wxTimer::wxTimer()

 {
 {

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

 }
 
 }
 

-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 );
+    if (millisecs != -1)
+    {
+        m_time = millisecs;
+    }
+
+    m_oneShot = oneShot;
+
+    m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+
+    return TRUE;

 }
 
 }
 

-void wxTimer::Stop(void)
+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;
+    }

 }
 
 }