/////////////////////////////////////////////////////////////////////////////
-// Name: timer.cpp
+// Name: msw/timer.cpp
// Purpose: wxTimer implementation
// Author: Julian Smart
-// Modified by:
+// Modified by: Vadim Zeitlin (use hash map instead of list, global rewrite)
// Created: 04/01/98
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "timer.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#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/hashmap.h"
#include "wx/timer.h"
+
#include "wx/msw/private.h"
-#include <time.h>
-#include <sys/types.h>
+// ----------------------------------------------------------------------------
+// private globals
+// ----------------------------------------------------------------------------
-#if !defined(__SC__) && !defined(__GNUWIN32__) && !defined(__MWERKS__)
- #include <sys/timeb.h>
-#endif
+// define a hash containing all the timers: it is indexed by timer id and
+// contains the corresponding timer
+WX_DECLARE_HASH_MAP(unsigned long, wxTimer *, wxIntegerHash, wxIntegerEqual,
+ wxTimerMap);
+
+// instead of using a global here, wrap it in a static function as otherwise it
+// could have been used before being initialized if a timer object were created
+// globally
+static wxTimerMap& TimerMap()
+{
+ static wxTimerMap s_timerMap;
+
+ return s_timerMap;
+}
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
-wxList wxTimerList(wxKEY_INTEGER);
-UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
+// timer callback used for all timers
+void WINAPI wxTimerProc(HWND hwnd, UINT msg, UINT_PTR idTimer, DWORD dwTime);
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
-#ifdef __WIN32__
- #define _EXPORT /**/
-#else
- #define _EXPORT _export
-#endif
-
-#if !USE_SHARED_LIBRARY
- IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
-#endif
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
// ============================================================================
// implementation
// ----------------------------------------------------------------------------
// wxTimer class
// ----------------------------------------------------------------------------
-wxTimer::wxTimer(void)
+
+void wxTimer::Init()
{
- milli = 0 ;
- lastMilli = -1 ;
- id = 0;
+ m_id = 0;
}
-wxTimer::~wxTimer(void)
+wxTimer::~wxTimer()
{
- Stop();
-
- wxTimerList.DeleteObject(this);
+ wxTimer::Stop();
}
-bool wxTimer::Start(int milliseconds, bool mode)
+bool wxTimer::Start(int milliseconds, bool oneShot)
{
- oneShot = mode ;
- if (milliseconds < 0)
- milliseconds = lastMilli;
-
- wxCHECK_MSG( milliseconds > 0, FALSE, "invalid value for timer timeour" );
+ (void)wxTimerBase::Start(milliseconds, oneShot);
- lastMilli = milli = milliseconds;
+ wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeout") );
- wxTimerList.DeleteObject(this);
- TIMERPROC wxTimerProcInst = (TIMERPROC)
- MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
+ m_id = ::SetTimer
+ (
+ NULL, // don't use window
+ 1, // id ignored with NULL hwnd anyhow
+ (UINT)m_milli, // delay
+ wxTimerProc // timer proc to call
+ );
- id = SetTimer(NULL, (UINT)(id ? id : 1),
- (UINT)milliseconds, wxTimerProcInst);
- if (id > 0)
+ if ( !m_id )
{
- wxTimerList.Append(id, this);
+ wxLogSysError(_("Couldn't create a timer"));
- return TRUE;
+ return false;
}
- else
+
+ // check that SetTimer() didn't reuse an existing id: according to the MSDN
+ // this can happen and this would be catastrophic to us as we rely on ids
+ // uniquely identifying the timers because we use them as keys in the hash
+ if ( TimerMap().find(m_id) != TimerMap().end() )
{
- wxLogSysError(_("Couldn't create a timer"));
+ wxLogError(_("Timer creation failed."));
+
+ ::KillTimer(NULL, m_id);
+ m_id = 0;
- return FALSE;
+ return false;
}
+
+ TimerMap()[m_id] = this;
+
+ return true;
}
-void wxTimer::Stop(void)
+void wxTimer::Stop()
{
- if (id) {
- KillTimer(NULL, (UINT)id);
- wxTimerList.DeleteObject(this); /* @@@@ */
+ if ( m_id )
+ {
+ ::KillTimer(NULL, m_id);
+
+ TimerMap().erase(m_id);
}
- id = 0 ;
- milli = 0 ;
+
+ m_id = 0;
}
// ----------------------------------------------------------------------------
// private functions
// ----------------------------------------------------------------------------
+
void wxProcessTimer(wxTimer& timer)
{
- // Avoid to process spurious timer events
- if ( timer.id == 0)
- return;
+ wxASSERT_MSG( timer.m_id != 0, _T("bogus timer id") );
- if ( timer.oneShot )
+ if ( timer.IsOneShot() )
timer.Stop();
timer.Notify();
}
-UINT WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
+void WINAPI
+wxTimerProc(HWND WXUNUSED(hwnd),
+ UINT WXUNUSED(msg),
+ UINT_PTR idTimer,
+ DWORD WXUNUSED(dwTime))
{
- wxNode *node = wxTimerList.Find((long)idTimer);
+ wxTimerMap::iterator node = TimerMap().find((unsigned long)idTimer);
- wxCHECK_MSG( node, 0, "bogus timer id in wxTimerProc" );
+ wxCHECK_RET( node != TimerMap().end(), wxT("bogus timer id in wxTimerProc") );
- wxProcessTimer(*(wxTimer *)node->Data());
-
- return 0;
+ wxProcessTimer(*(node->second));
}
+
+#endif // wxUSE_TIMER
+
projects / wxWidgets.git / blobdiff