fixing osx_carbon

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index 89ecf05f6d2fdca9f67d59b672b5273be9691ee3..acd3e9747ac103ad5f43bb1a10664de67f898f1b 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -1,67 +1,66 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        timer.cpp
-// Purpose:
+// Name:        src/gtk1/timer.cpp
+// Purpose:     wxTimer implementation

 // Author:      Robert Roebling
 // Author:      Robert Roebling

-// Id:          $id$
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// 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_ABSTRACT_CLASS(wxTimer,wxObject)
+// ----------------------------------------------------------------------------
+// wxTimer
+// ----------------------------------------------------------------------------

 
 

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

 {
 {

-  wxTimer *timer = (wxTimer*)data;
-  timer->Notify();
+    wxTimerImpl * const timer = (wxTimerImpl *)data;

 
 

-  if ( timer->OneShot() )
-    timer->Stop();
+    const bool keepGoing = !timer->IsOneShot();
+    if ( !keepGoing )
+        timer->Stop();

 
 

-  return TRUE;
-}
+    // 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();

 
 

-wxTimer::wxTimer()
-{
-  m_tag = -1;
-  m_time = 1000;
-  m_oneShot = FALSE;
-}
+    timer->Notify();

 
 

-wxTimer::~wxTimer()
-{
-  Stop();
+    // Release lock again.
+    gdk_threads_leave();
+
+    return keepGoing;
+}

 }
 
 }
 

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

 {
 {

-  if ( millisecs != -1 )
-    m_time = millisecs;
+    if ( !wxTimerImpl::Start(millisecs, oneShot) )
+        return false;

 
 

-  m_oneShot = oneShot;
+    wxASSERT_MSG( m_tag == -1, wxT("shouldn't be still running") );

 
 

-  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 wxGTKTimerImpl::Stop()

 {
 {

-  if ( m_tag != -1 )
-  {
-    gtk_timeout_remove( m_tag );
+    wxASSERT_MSG( m_tag != -1, wxT("should be running") );

 
 

+    gtk_timeout_remove( m_tag );

     m_tag = -1;
     m_tag = -1;

-  }

 }
 
 }
 

+#endif // wxUSE_TIMER
+