projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added wxEVT_SCROLL[WIN]_THUMBRELEASE
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
timer.h
diff --git
a/include/wx/gtk1/timer.h
b/include/wx/gtk1/timer.h
index 80e302758b896857c21216490701f73956c82a45..91fbc1002e8e900f97503d502ba55d88f23494b5 100644
(file)
--- a/
include/wx/gtk1/timer.h
+++ b/
include/wx/gtk1/timer.h
@@
-1,10
+1,10
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: timer.h
+// Name:
wx/gtk/
timer.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
@@
-12,41
+12,30
@@
#define __GTKTIMERH__
#ifdef __GNUG__
#define __GTKTIMERH__
#ifdef __GNUG__
-#pragma interface
+ #pragma interface "timer.h"
#endif
#endif
-#include "wx/defs.h"
-#include "wx/object.h"
-
-//-----------------------------------------------------------------------------
-// derived classes
-//-----------------------------------------------------------------------------
-
-class wxTimer;
-
//-----------------------------------------------------------------------------
// wxTimer
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxTimer
//-----------------------------------------------------------------------------
-class wxTimer
: public wxObject
+class wxTimer
: public wxTimerBase
{
public:
{
public:
- wxTimer();
+ wxTimer() { Init(); }
+ wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
+ { Init(); }
~wxTimer();
~wxTimer();
- int Interval() const { return m_time; }
-
- bool OneShot() const { return m_oneShot; }
-
virtual bool Start( int millisecs = -1, bool oneShot = FALSE );
virtual void Stop();
virtual bool Start( int millisecs = -1, bool oneShot = FALSE );
virtual void Stop();
- virtual
void Notify() = 0; // override this
+ virtual
bool IsRunning() const { return m_tag != -1; }
protected:
protected:
+ void Init();
+
int m_tag;
int m_tag;
- int m_time;
- bool m_oneShot;
private:
DECLARE_ABSTRACT_CLASS(wxTimer)
private:
DECLARE_ABSTRACT_CLASS(wxTimer)