Don't create GtkScrolledWindow if neither wxHSCROLL

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

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index ab9e36893186bdcc635daa4600362efe117ef3be..7bb0317952ef23068addc4b1700cae8a5b20b0e0 100644 (file)
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -1,73 +1,85 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gtk/timer.cpp
-// Purpose:
+// Purpose:     wxTimer implementation
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
 
-#ifdef __GNUG__
-#pragma implementation "timer.h"
-#endif
+#if wxUSE_TIMER
 
 #include "wx/timer.h"
 
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
 
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // wxTimer
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
-static gint timeout_callback( gpointer data )
+extern "C" {
+static gboolean timeout_callback(gpointer data)
 {
     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 */
+    // 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 */
+    // Release lock again.
     gdk_threads_leave();
 
-    if ( timer->IsOneShot() )
-        return FALSE;
-
-    return TRUE;
+    return !timer->IsOneShot();
+}
 }
 
 void wxTimer::Init()
 {
-    m_tag = -1;
+    m_sourceId = 0;
     m_milli = 1000;
 }
 
 wxTimer::~wxTimer()
 {
-    wxTimer::Stop();
+    Stop();
 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
     (void)wxTimerBase::Start(millisecs, oneShot);
 
-    m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
+    if (m_sourceId != 0)
+        g_source_remove(m_sourceId);
 
-    return TRUE;
+    m_sourceId = g_timeout_add(m_milli, timeout_callback, this);
+
+    return true;
 }
 
 void wxTimer::Stop()
 {
-    if (m_tag != -1)
+    if (m_sourceId != 0)
     {
-        gtk_timeout_remove( m_tag );
-        m_tag = -1;
+        g_source_remove(m_sourceId);
+        m_sourceId = 0;
     }
 }
 
+#endif // wxUSE_TIMER
+