X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c9a19aabab3a878b565e6c2a5f2a3824277c4dc..7230716d7a2623cb78fa84f8ed66f20aa388a9b4:/src/msw/timer.cpp

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 0fe07b64a3..796db83d7a 100644
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.cpp
+// Name:        msw/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      Julian Smart
 // Modified by:
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "timer.h"
 #endif
 
@@ -23,7 +23,6 @@
 #if wxUSE_TIMER
 
 #ifndef WX_PRECOMP
-    #include "wx/setup.h"
     #include "wx/window.h"
     #include "wx/list.h"
     #include "wx/event.h"
@@ -32,31 +31,36 @@
     #include "wx/log.h"
 #endif
 
+#include "wx/hashmap.h"
+
 #include "wx/timer.h"
 
 #include "wx/msw/private.h"
 
+// from utils.cpp
+extern "C" WXDLLIMPEXP_BASE HWND
+wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
+
 // ----------------------------------------------------------------------------
-// private functions
+// private globals
 // ----------------------------------------------------------------------------
 
-wxList wxTimerList(wxKEY_INTEGER);
-UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
+// 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);
+
+static wxTimerMap g_timerMap;
 
 // ----------------------------------------------------------------------------
-// macros
+// private functions
 // ----------------------------------------------------------------------------
 
-#ifdef __WIN32__
-    #define _EXPORT
-#else
-    #define _EXPORT _export
-#endif
+void WINAPI wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
 
-// should probably be in wx/msw/private.h
-#ifdef __WXMICROWIN__
-    #define MakeProcInstance(proc, hinst) proc
-#endif
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
 
@@ -76,8 +80,6 @@ void wxTimer::Init()
 wxTimer::~wxTimer()
 {
     wxTimer::Stop();
-
-    wxTimerList.DeleteObject(this);
 }
 
 bool wxTimer::Start(int milliseconds, bool oneShot)
@@ -86,33 +88,46 @@ bool wxTimer::Start(int milliseconds, bool oneShot)
 
     wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeour") );
 
-    TIMERPROC wxTimerProcInst = (TIMERPROC)
-        MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
-
-    m_id = ::SetTimer(NULL, (UINT)(m_id ? m_id : 1),
-                      (UINT)m_milli, wxTimerProcInst);
+    m_id = ::SetTimer
+             (
+                NULL,                       // don't use window
+                1,                          // id ignored with NULL hwnd anyhow
+                (UINT)m_milli,              // delay
+                (TIMERPROC)wxTimerProc      // timer proc to call
+             );
 
-    if ( m_id > 0 )
+    if ( !m_id )
     {
-        wxTimerList.Append(m_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 ( g_timerMap.find(m_id) != g_timerMap.end() )
     {
-        wxLogSysError(_("Couldn't create a timer"));
+        wxLogError(_("Timer creation failed."));
+
+        ::KillTimer(NULL, m_id);
+        m_id = 0;
 
         return false;
     }
+
+    g_timerMap[m_id] = this;
+
+    return true;
 }
 
 void wxTimer::Stop()
 {
     if ( m_id )
     {
-        ::KillTimer(NULL, (UINT)m_id);
+        ::KillTimer(NULL, m_id);
 
-        wxTimerList.DeleteObject(this);
+        g_timerMap.erase(m_id);
     }
 
     m_id = 0;
@@ -124,9 +139,7 @@ void wxTimer::Stop()
 
 void wxProcessTimer(wxTimer& timer)
 {
-    // Avoid to process spurious timer events
-    if ( timer.m_id == 0)
-        return;
+    wxASSERT_MSG( timer.m_id != 0, _T("bogus timer id") );
 
     if ( timer.IsOneShot() )
         timer.Stop();
@@ -134,15 +147,14 @@ void wxProcessTimer(wxTimer& timer)
     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);
+    wxTimerMap::iterator node = g_timerMap.find(idTimer);
 
-    wxCHECK_MSG( node, 0, wxT("bogus timer id in wxTimerProc") );
+    wxCHECK_RET( node != g_timerMap.end(), wxT("bogus timer id in wxTimerProc") );
 
-    wxProcessTimer(*(wxTimer *)node->GetData());
-
-    return 0;
+    wxProcessTimer(*(node->second));
 }
 
 #endif // wxUSE_TIMER
+