projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revert last change (r48897)
[wxWidgets.git]
/
src
/
gtk1
/
timer.cpp
diff --git
a/src/gtk1/timer.cpp
b/src/gtk1/timer.cpp
index 36aada6e6fc9c92920245527a2b1ca33c5c45163..b90de7064c5aa1cfacadbc78dcf7d12af6f58662 100644
(file)
--- a/
src/gtk1/timer.cpp
+++ b/
src/gtk1/timer.cpp
@@
-1,72
+1,66
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// 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
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
+#include "wx/wxprec.h"
-#ifdef __GNUG__
-#pragma implementation "timer.h"
-#endif
+#if wxUSE_TIMER
-#include "wx/timer.h"
+#include "wx/
gtk1/private/
timer.h"
#include "gtk/gtk.h"
#include "gtk/gtk.h"
-//
-
----------------------------------------------------------------------------
+//
----------------------------------------------------------------------------
// wxTimer
// wxTimer
-//
-
----------------------------------------------------------------------------
+//
----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
-
-gint timeout_callback( gpointer data )
+extern "C" {
+static gint timeout_callback(void *data)
{
{
- wxTimer *timer = (wxTimer*)data;
- timer->Notify();
+ wxTimerImpl * const timer = (wxTimerImpl *)data;
- if (timer->OneShot())
- {
+ const bool keepGoing = !timer->IsOneShot();
+ if ( !keepGoing )
timer->Stop();
timer->Stop();
- }
- return TRUE;
-}
+ // 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();
-wxTimer::wxTimer()
-{
- m_tag = -1;
- m_time = 1000;
- m_oneShot = FALSE;
-}
+ timer->Notify();
-wxTimer::~wxTimer()
-{
- Stop();
+ // Release lock again.
+ gdk_threads_leave();
+
+ return keepGoing;
+}
}
}
-bool wx
Timer::Start( int millisecs, bool oneShot
)
+bool wx
GTKTimerImpl::Start(int millisecs, bool oneShot
)
{
{
- if (millisecs != -1)
- {
- m_time = millisecs;
- }
+ if ( !wxTimerImpl::Start(millisecs, oneShot) )
+ return false;
-
m_oneShot = oneShot
;
+
wxASSERT_MSG( m_tag == -1, _T("shouldn't be still running") )
;
- m_tag = gtk_timeout_add( m
illisecs
, timeout_callback, this );
+ m_tag = gtk_timeout_add( m
_milli
, timeout_callback, this );
- return
TRUE
;
+ return
true
;
}
}
-void wx
Timer
::Stop()
+void wx
GTKTimerImpl
::Stop()
{
{
- if (m_tag != -1)
- {
- gtk_timeout_remove( m_tag );
- m_tag = -1;
- }
+ wxASSERT_MSG( m_tag != -1, _T("should be running") );
+
+ gtk_timeout_remove( m_tag );
+ m_tag = -1;
}
}
+#endif // wxUSE_TIMER
+