projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
compilation fix for Watcom/DOS
[wxWidgets.git]
/
src
/
gtk
/
timer.cpp
diff --git
a/src/gtk/timer.cpp
b/src/gtk/timer.cpp
index 175c92aa12168af15f1b170d51d12b7eeef18c67..2afdb78df9d716d3fd4dacd2196b2b7e546bc8d0 100644
(file)
--- a/
src/gtk/timer.cpp
+++ b/
src/gtk/timer.cpp
@@
-1,6
+1,6
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// 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
@@
-12,15
+12,19
@@
#pragma implementation "timer.h"
#endif
#pragma implementation "timer.h"
#endif
+#include "wx/defs.h"
+
+#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,
wxObject)
static gint timeout_callback( gpointer data )
{
static gint timeout_callback( gpointer data )
{
@@
-42,11
+46,10
@@
static gint timeout_callback( gpointer data )
return TRUE;
}
return TRUE;
}
-
wxTimer::wxTimer
()
+
void wxTimer::Init
()
{
m_tag = -1;
m_milli = 1000;
{
m_tag = -1;
m_milli = 1000;
- m_oneShot = FALSE;
}
wxTimer::~wxTimer()
}
wxTimer::~wxTimer()
@@
-58,6
+61,9
@@
bool wxTimer::Start( int millisecs, bool oneShot )
{
(void)wxTimerBase::Start(millisecs, oneShot);
{
(void)wxTimerBase::Start(millisecs, oneShot);
+ if (m_tag != -1)
+ gtk_timeout_remove( m_tag );
+
m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
return TRUE;
m_tag = gtk_timeout_add( m_milli, timeout_callback, this );
return TRUE;
@@
-72,3
+78,5
@@
void wxTimer::Stop()
}
}
}
}
+#endif // wxUSE_TIMER
+