Image size fix

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

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index cf9d2c64a3ac5a34010b879749ba99b6c284984c..628ede1a184036807f7cbd8b4351ab92b56e0cdd 100644 (file)
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -1,71 +1,69 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// 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 "wx/gtk/private/timer.h"

 
 

-//-----------------------------------------------------------------------------
-// wxTimer
-//-----------------------------------------------------------------------------
+#include <gtk/gtk.h>

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxTimer,wxObject)
+// ----------------------------------------------------------------------------
+// wxTimerImpl
+// ----------------------------------------------------------------------------

 
 

-gint timeout_callback( gpointer data )
-{
-  wxTimer *timer = (wxTimer*)data;
-  timer->Notify();
-  if (timer->OneShot()) timer->Stop();
-  return TRUE;
-}
+extern "C" {

 
 

-wxTimer::wxTimer(void)
+static gboolean timeout_callback(gpointer data)

 {
 {

-  m_tag = -1;
-  m_time = 1000;
-  m_oneShot = FALSE;
-}
+    wxGTKTimerImpl *timer = (wxGTKTimerImpl*)data;

 
 

-wxTimer::~wxTimer(void)
-{
-  Stop();
-}
+    const bool keepGoing = !timer->IsOneShot();
+    if ( !keepGoing )
+        timer->Stop();

 
 

-int wxTimer::Interval(void)
-{
-  return m_time;
-}
+    // 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 wxTimer::OneShot(void)
-{
-  return m_oneShot;
-}
+    timer->Notify();

 
 

-void wxTimer::Notify(void)
-{
+    // Release lock again.
+    gdk_threads_leave();
+
+    return keepGoing;

 }
 
 }
 

-void wxTimer::Start( int millisecs, bool oneShot )
+} // extern "C"
+
+bool wxGTKTimerImpl::Start(int millisecs, bool oneShot)

 {
 {

-  if (millisecs != -1) m_time = millisecs;
-  m_oneShot = oneShot;
-  m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+    if ( !wxTimerImpl::Start(millisecs, oneShot) )
+        return false;
+
+    wxASSERT_MSG( !m_sourceId, _T("shouldn't be still running") );
+
+    m_sourceId = g_timeout_add(m_milli, timeout_callback, this);
+
+    return true;

 }
 
 }
 

-void wxTimer::Stop(void)
+void wxGTKTimerImpl::Stop()

 {
 {

-  if (m_tag != -1)
-    gtk_timeout_remove( m_tag );
-  m_tag = -1;
+    wxASSERT_MSG( m_sourceId, _T("should be running") );
+
+    g_source_remove(m_sourceId);
+    m_sourceId = 0;

 }
 
 }
 

+#endif // wxUSE_TIMER
+