simplify code so it always returns the same object

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index cf9d2c64a3ac5a34010b879749ba99b6c284984c..acd3e9747ac103ad5f43bb1a10664de67f898f1b 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -1,71 +1,66 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.cpp
-// Purpose:
+// Name:        src/gtk1/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
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
 
-#ifdef __GNUG__
-#pragma implementation "timer.h"
-#endif
+#if wxUSE_TIMER
 
-#include "wx/timer.h"
+#include "wx/gtk1/private/timer.h"
 
-//-----------------------------------------------------------------------------
-// wxTimer
-//-----------------------------------------------------------------------------
+#include "gtk/gtk.h"
 
-IMPLEMENT_DYNAMIC_CLASS(wxTimer,wxObject)
+// ----------------------------------------------------------------------------
+// wxTimer
+// ----------------------------------------------------------------------------
 
-gint timeout_callback( gpointer data )
+extern "C" {
+static gint timeout_callback(void *data)
 {
-  wxTimer *timer = (wxTimer*)data;
-  timer->Notify();
-  if (timer->OneShot()) timer->Stop();
-  return TRUE;
-}
+    wxTimerImpl * const timer = (wxTimerImpl *)data;
 
-wxTimer::wxTimer(void)
-{
-  m_tag = -1;
-  m_time = 1000;
-  m_oneShot = FALSE;
-}
+    const bool keepGoing = !timer->IsOneShot();
+    if ( !keepGoing )
+        timer->Stop();
 
-wxTimer::~wxTimer(void)
-{
-  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();
 
-int wxTimer::Interval(void)
-{
-  return m_time;
-}
+    timer->Notify();
 
-bool wxTimer::OneShot(void)
-{
-  return m_oneShot;
-}
+    // Release lock again.
+    gdk_threads_leave();
 
-void wxTimer::Notify(void)
-{
+    return keepGoing;
+}
 }
 
-void wxTimer::Start( int millisecs, bool oneShot )
+bool wxGTKTimerImpl::Start(int millisecs, bool oneShot)
 {
-  if (millisecs != -1) m_time = millisecs;
-  m_oneShot = oneShot;
-  m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+    if ( !wxTimerImpl::Start(millisecs, oneShot) )
+        return false;
+
+    wxASSERT_MSG( m_tag == -1, wxT("shouldn't be still running") );
+
+    m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
+
+    return true;
 }
 
-void wxTimer::Stop(void)
+void wxGTKTimerImpl::Stop()
 {
-  if (m_tag != -1)
+    wxASSERT_MSG( m_tag != -1, wxT("should be running") );
+
     gtk_timeout_remove( m_tag );
-  m_tag = -1;
+    m_tag = -1;
 }
 
+#endif // wxUSE_TIMER
+