fixes for several fatal problems when using wxComboCtrl as popup (patch 1539124)

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

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index 36aada6e6fc9c92920245527a2b1ca33c5c45163..eb7a15fbb5db874745ae9bfcea3ac22b2823926b 100644 (file)
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -1,62 +1,76 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        timer.cpp
-// Purpose:
+// Name:        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 "gtk/gtk.h"
 
 
 #include "wx/timer.h"
 
 #include "gtk/gtk.h"
 

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxTimer
 // wxTimer

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)

 
 

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

 {
     wxTimer *timer = (wxTimer*)data;
 {
     wxTimer *timer = (wxTimer*)data;

-    timer->Notify();

 
 

-    if (timer->OneShot())
+    // Don't change the order of anything in this callback!
+
+    if (timer->IsOneShot())

     {
     {

+        // This sets m_tag to -1

         timer->Stop();
     }
 
         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.
+    gdk_threads_leave();
+
+    if (timer->IsOneShot())
+        return FALSE;
+

     return TRUE;
 }
     return TRUE;
 }

+}

 
 

-wxTimer::wxTimer()
+void wxTimer::Init()

 {
     m_tag = -1;
 {
     m_tag = -1;

-    m_time = 1000;
-    m_oneShot = FALSE;
+    m_milli = 1000;

 }
 
 wxTimer::~wxTimer()
 {
 }
 
 wxTimer::~wxTimer()
 {

-    Stop();
+    wxTimer::Stop();

 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
 }
 
 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)
+        g_source_remove( m_tag );

 
 

-    m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+    m_tag = g_timeout_add( m_milli, timeout_callback, this );

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -65,8 +79,10 @@ void wxTimer::Stop()
 {
     if (m_tag != -1)
     {
 {
     if (m_tag != -1)
     {

-        gtk_timeout_remove( m_tag );
+        g_source_remove( m_tag );

         m_tag = -1;
     }
 }
 
         m_tag = -1;
     }
 }
 

+#endif // wxUSE_TIMER
+