projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
new makefile
[wxWidgets.git]
/
src
/
gtk1
/
timer.cpp
diff --git
a/src/gtk1/timer.cpp
b/src/gtk1/timer.cpp
index f87bffa62bbb1d36ce5a9f5a4c7bb35d8f5caa57..a8514f8cd169098e08cfc5694cc2b6b332396a63 100644
(file)
--- a/
src/gtk1/timer.cpp
+++ b/
src/gtk1/timer.cpp
@@
-1,11
+1,10
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// 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
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
@@
-13,59
+12,71
@@
#pragma implementation "timer.h"
#endif
#pragma implementation "timer.h"
#endif
+#include "wx/defs.h"
+
+#if wxUSE_TIMER
+
#include "wx/timer.h"
#include "wx/timer.h"
-//-----------------------------------------------------------------------------
+#include "gtk/gtk.h"
+
+// ----------------------------------------------------------------------------
// wxTimer
// wxTimer
-//
-
----------------------------------------------------------------------------
+//
----------------------------------------------------------------------------
-IMPLEMENT_
DYNAMIC_CLASS(wxTimer,
wxObject)
+IMPLEMENT_
ABSTRACT_CLASS(wxTimer,
wxObject)
-gint timeout_callback( gpointer data )
+
extern "C"
gint timeout_callback( gpointer data )
{
{
- wxTimer *timer = (wxTimer*)data;
- timer->Notify();
- if (timer->OneShot()) timer->Stop();
- return TRUE;
-};
+ wxTimer *timer = (wxTimer*)data;
-wxTimer::wxTimer(void)
-{
- m_tag = -1;
- m_time = 1000;
- m_oneShot = FALSE;
-};
+ /* 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(void)
-{
- Stop();
-};
+ timer->Notify();
-int wxTimer::Interval(void)
-{
- return m_time;
-};
+ /* release lock again */
+ gdk_threads_leave();
-bool wxTimer::OneShot(void)
+ if ( timer->IsOneShot() )
+ return FALSE;
+
+ return TRUE;
+}
+
+void wxTimer::Init()
{
{
- return m_oneShot;
-};
+ m_tag = -1;
+ m_milli = 1000;
+}
-
void wxTimer::Notify(void
)
+
wxTimer::~wxTimer(
)
{
{
-};
+ wxTimer::Stop();
+}
-
void
wxTimer::Start( int millisecs, bool oneShot )
+
bool
wxTimer::Start( int millisecs, bool oneShot )
{
{
-
if (millisecs != -1) m_time = millisecs
;
- m_oneShot = oneShot;
- m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
-
}
;
+
(void)wxTimerBase::Start(millisecs, oneShot)
;
+
+ if (m_tag != -1)
+
gtk_timeout_remove( m_tag )
;
-void wxTimer::Stop(void)
+ m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
+
+ return TRUE;
+}
+
+void wxTimer::Stop()
{
{
- if (m_tag != -1)
- gtk_timeout_remove( m_tag );
- m_tag = -1;
-};
+ if (m_tag != -1)
+ {
+ gtk_timeout_remove( m_tag );
+ m_tag = -1;
+ }
+}
+
+#endif // wxUSE_TIMER