Fix memory leak when a spacer is added, and crash when a window is added before wxSiz...

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index fb74fc13dc8bc7352e50c127c7339fe1c8773d13..e004d2d4bea293908db6fb21824c1f23a1ead528 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -1,107 +1,81 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.cpp
-// Purpose:
+// Name:        gtk/timer.cpp
+// Purpose:     wxTimer implementation
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "timer.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_TIMER
+
 #include "wx/timer.h"
 
 #include "gtk/gtk.h"
-/*
-#include "glib.h"
-*/
 
-//-----------------------------------------------------------------------------
-// global functions
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxTimer
+// ----------------------------------------------------------------------------
 
-/*
-static GTimer *g_timer = (GTimer*) NULL;
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
-void wxStartTimer()
+extern "C" {
+static gint timeout_callback( gpointer data )
 {
-    if (g_timer)
-    {
-        g_timer_rest( g_timer );
-    }
-    else
-    {
-        g_timer = g_timer_new();
-        g_timer_start( g_timer );
-    }
-}
+    wxTimer *timer = (wxTimer*)data;
 
-long wxGetElapsedTime( bool resetTimer )
-{
-    gulong res = 0;
-    if (g_timer)
+    // Don't change the order of anything in this callback!
+    
+    if (timer->IsOneShot())
     {
-        g_timer_elapsed( g_timer, &res );
-       if (resetTimer) g_timer_reset( g_timer );
+        // This sets m_tag to -1
+        timer->Stop();
     }
     
-    return res;
-}
+    // 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();
 
-bool wxGetLocalTime( long *timeZone, int *dstObserved )
-{
-}
-
-long wxGetCurrentTime()
-{
-}
-*/
-
-
-//-----------------------------------------------------------------------------
-// wxTimer
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
-
-gint timeout_callback( gpointer data )
-{
-    wxTimer *timer = (wxTimer*)data;
     timer->Notify();
 
-    if (timer->OneShot())
-    {
-        timer->Stop();
-    }
+    // Release lock again.
+    gdk_threads_leave();
+
+    if (timer->IsOneShot())
+        return FALSE;
 
     return TRUE;
 }
+}
 
-wxTimer::wxTimer()
+void wxTimer::Init()
 {
     m_tag = -1;
-    m_time = 1000;
-    m_oneShot = FALSE;
+    m_milli = 1000;
 }
 
 wxTimer::~wxTimer()
 {
-    Stop();
+    wxTimer::Stop();
 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
-    if (millisecs != -1)
-    {
-        m_time = millisecs;
-    }
+    (void)wxTimerBase::Start(millisecs, oneShot);
 
-    m_oneShot = oneShot;
+    if (m_tag != -1)
+        gtk_timeout_remove( m_tag );
 
-    m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+    m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
 
     return TRUE;
 }
@@ -115,3 +89,5 @@ void wxTimer::Stop()
     }
 }
 
+#endif // wxUSE_TIMER
+