// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
#ifdef __GNUG__
#pragma implementation "timer.h"
#endif
#pragma hdrstop
#endif
+#if wxUSE_TIMER
+
#ifndef WX_PRECOMP
#include "wx/setup.h"
+ #include "wx/window.h"
#include "wx/list.h"
+ #include "wx/event.h"
#include "wx/app.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
#endif
-#include "wx/intl.h"
-#include "wx/log.h"
-
#include "wx/timer.h"
-#include "wx/msw/private.h"
-#include <time.h>
-#include <sys/types.h>
-
-#if !defined(__SC__) && !defined(__GNUWIN32__)
- #include <sys/timeb.h>
-#endif
+#include "wx/msw/private.h"
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
#ifdef __WIN32__
- #define _EXPORT /**/
+ #define _EXPORT
#else
#define _EXPORT _export
#endif
-#if !USE_SHARED_LIBRARY
- IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+// should probably be in wx/msw/private.h
+#ifdef __WXMICROWIN__
+ #define MakeProcInstance(proc, hinst) proc
#endif
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+
// ============================================================================
// implementation
// ============================================================================
// ----------------------------------------------------------------------------
// wxTimer class
// ----------------------------------------------------------------------------
-wxTimer::wxTimer(void)
+
+void wxTimer::Init()
{
- milli = 0 ;
- lastMilli = -1 ;
- id = 0;
+ m_id = 0;
}
-wxTimer::~wxTimer(void)
+wxTimer::~wxTimer()
{
- Stop();
+ wxTimer::Stop();
wxTimerList.DeleteObject(this);
}
-bool wxTimer::Start(int milliseconds, bool mode)
+bool wxTimer::Start(int milliseconds, bool oneShot)
{
- oneShot = mode ;
- if (milliseconds < 0)
- milliseconds = lastMilli;
+ (void)wxTimerBase::Start(milliseconds, oneShot);
- wxCHECK_MSG( milliseconds > 0, FALSE, "invalid value for timer timeour" );
+ wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeour") );
- lastMilli = milli = milliseconds;
-
- wxTimerList.DeleteObject(this);
TIMERPROC wxTimerProcInst = (TIMERPROC)
MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
- id = SetTimer(NULL, (UINT)(id ? id : 1),
- (UINT)milliseconds, wxTimerProcInst);
- if (id > 0)
+ m_id = ::SetTimer(NULL, (UINT)(m_id ? m_id : 1),
+ (UINT)m_milli, wxTimerProcInst);
+
+ if ( m_id > 0 )
{
- wxTimerList.Append(id, this);
+ wxTimerList.Append(m_id, this);
- return TRUE;
+ return true;
}
else
{
wxLogSysError(_("Couldn't create a timer"));
- return FALSE;
+ return false;
}
}
-void wxTimer::Stop(void)
+void wxTimer::Stop()
{
- if (id) {
- KillTimer(NULL, (UINT)id);
- wxTimerList.DeleteObject(this); /* @@@@ */
+ if ( m_id )
+ {
+ ::KillTimer(NULL, (UINT)m_id);
+
+ wxTimerList.DeleteObject(this);
}
- id = 0 ;
- milli = 0 ;
+
+ m_id = 0;
}
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
-static void wxProcessTimer(wxTimer& timer)
+
+void wxProcessTimer(wxTimer& timer)
{
// Avoid to process spurious timer events
- if ( timer.id == 0)
+ if ( timer.m_id == 0)
return;
- if ( timer.oneShot )
+ if ( timer.IsOneShot() )
timer.Stop();
timer.Notify();
{
wxNode *node = wxTimerList.Find((long)idTimer);
- wxCHECK_MSG( node, 0, "bogus timer id in wxTimerProc" );
+ wxCHECK_MSG( node, 0, wxT("bogus timer id in wxTimerProc") );
- wxProcessTimer(*(wxTimer *)node->Data());
+ wxProcessTimer(*(wxTimer *)node->GetData());
return 0;
}
+
+#endif // wxUSE_TIMER