Fix double deletion bug in wxGTK wxDVC dnd code.

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

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index fb74fc13dc8bc7352e50c127c7339fe1c8773d13..8f9fd46dc0b62e9d76852f608847c6c3e47689e1 100644 (file)
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -1,117 +1,74 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// 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 "wx/gtk/private/timer.h"
+#include "wx/app.h"

 
 

-#include "gtk/gtk.h"
-/*
-#include "glib.h"
-*/
+#include <gtk/gtk.h>

 
 

-//-----------------------------------------------------------------------------
-// global functions
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// wxTimerImpl
+// ----------------------------------------------------------------------------

 
 

-/*
-static GTimer *g_timer = (GTimer*) NULL;
+extern "C" {

 
 

-void wxStartTimer()
+static gboolean timeout_callback(gpointer data)

 {
 {

-    if (g_timer)
-    {
-        g_timer_rest( g_timer );
-    }
-    else
-    {
-        g_timer = g_timer_new();
-        g_timer_start( g_timer );
-    }
-}
-
-long wxGetElapsedTime( bool resetTimer )
-{
-    gulong res = 0;
-    if (g_timer)
-    {
-        g_timer_elapsed( g_timer, &res );
-       if (resetTimer) g_timer_reset( g_timer );
-    }
-    
-    return res;
-}
-
-bool wxGetLocalTime( long *timeZone, int *dstObserved )
-{
-}
-
-long wxGetCurrentTime()
-{
-}
-*/
+    wxGTKTimerImpl *timer = (wxGTKTimerImpl*)data;

 
 

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

 
 

-//-----------------------------------------------------------------------------
-// wxTimer
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
+    // 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();

 
 

-gint timeout_callback( gpointer data )
-{
-    wxTimer *timer = (wxTimer*)data;

     timer->Notify();
 
     timer->Notify();
 

-    if (timer->OneShot())
-    {
-        timer->Stop();
-    }
+    // Release lock again.
+    gdk_threads_leave();

 
 

-    return TRUE;
-}
+    wxApp* app = wxTheApp;
+    if (app)
+        app->WakeUpIdle();

 
 

-wxTimer::wxTimer()
-{
-    m_tag = -1;
-    m_time = 1000;
-    m_oneShot = FALSE;
+    return keepGoing;

 }
 
 }
 

-wxTimer::~wxTimer()
-{
-    Stop();
-}
+} // extern "C"

 
 

-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_sourceId, wxT("shouldn't be still running") );

 
 

-    m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+    m_sourceId = g_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 );
-        m_tag = -1;
-    }
+    wxASSERT_MSG( m_sourceId, wxT("should be running") );
+
+    g_source_remove(m_sourceId);
+    m_sourceId = 0;

 }
 
 }
 

+#endif // wxUSE_TIMER
+