// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "timer.h"
#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/log.h"
#endif
+#include "wx/hashmap.h"
+
#include "wx/timer.h"
#include "wx/msw/private.h"
// private functions
// ----------------------------------------------------------------------------
-wxList wxTimerList(wxKEY_INTEGER);
-UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
+WX_DECLARE_HASH_MAP( long,
+ wxTimer *,
+ wxIntegerHash,
+ wxIntegerEqual,
+ wxTimerMap );
+
+wxTimerMap wxTimerList;
+
+void WINAPI wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
-#ifdef __WIN32__
- #define _EXPORT
-#else
- #define _EXPORT _export
-#endif
-
-// should probably be in wx/msw/private.h
+// should probably be in wx/msw/missing.h
#ifdef __WXMICROWIN__
#define MakeProcInstance(proc, hinst) proc
#endif
wxTimer::~wxTimer()
{
+ long id = m_id;
+
wxTimer::Stop();
- wxTimerList.DeleteObject(this);
+ wxTimerList.erase(id);
}
bool wxTimer::Start(int milliseconds, bool oneShot)
wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeour") );
+#ifdef __WXWINCE__
+ m_id = ::SetTimer(NULL, (UINT)(m_id ? m_id : 1),
+ (UINT)m_milli, (TIMERPROC) wxTimerProc);
+#else
TIMERPROC wxTimerProcInst = (TIMERPROC)
MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
m_id = ::SetTimer(NULL, (UINT)(m_id ? m_id : 1),
(UINT)m_milli, wxTimerProcInst);
+#endif
if ( m_id > 0 )
{
- wxTimerList.Append(m_id, this);
+ wxTimerList[m_id] = this;
return true;
}
{
::KillTimer(NULL, (UINT)m_id);
- wxTimerList.DeleteObject(this);
+ wxTimerList.erase(m_id);
}
m_id = 0;
timer.Notify();
}
-UINT WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
+void WINAPI wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
{
- wxNode *node = wxTimerList.Find((long)idTimer);
-
- wxCHECK_MSG( node, 0, wxT("bogus timer id in wxTimerProc") );
+
+ wxTimerMap::iterator node = wxTimerList.find((long)idTimer);
- wxProcessTimer(*(wxTimer *)node->GetData());
+ wxASSERT_MSG( node != wxTimerList.end(), wxT("bogus timer id in wxTimerProc") );
- return 0;
+ wxProcessTimer(*(node->second));
}
#endif // wxUSE_TIMER
+