X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d20f7ae50a3238d3846052bee83d47ba7ced735..4f450f41a2c02db9c35e3e566b381c85b5714de8:/src/msw/timer.cpp?ds=sidebyside

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 883f67bfa2..8fe20ab638 100644
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/timer.cpp
+// Name:        src/msw/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (use hash map instead of list, global rewrite)
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "timer.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -22,19 +18,18 @@
 
 #if wxUSE_TIMER
 
+#include "wx/timer.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/window.h"
     #include "wx/list.h"
+    #include "wx/window.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
+    #include "wx/hashmap.h"
 #endif
 
-#include "wx/hashmap.h"
-
-#include "wx/timer.h"
-
 #include "wx/msw/private.h"
 
 // ----------------------------------------------------------------------------
@@ -46,14 +41,22 @@
 WX_DECLARE_HASH_MAP(unsigned long, wxTimer *, wxIntegerHash, wxIntegerEqual,
                     wxTimerMap);
 
-static wxTimerMap g_timerMap;
+// 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
 // ----------------------------------------------------------------------------
 
 // timer callback used for all timers
-void WINAPI wxTimerProc(HWND hwnd, UINT msg, UINT idTimer, DWORD dwTime);
+void WINAPI wxTimerProc(HWND hwnd, UINT msg, UINT_PTR idTimer, DWORD dwTime);
 
 // ----------------------------------------------------------------------------
 // macros
@@ -83,7 +86,7 @@ bool wxTimer::Start(int milliseconds, bool oneShot)
 {
     (void)wxTimerBase::Start(milliseconds, oneShot);
 
-    wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeour") );
+    wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeout") );
 
     m_id = ::SetTimer
              (
@@ -103,7 +106,7 @@ bool wxTimer::Start(int milliseconds, bool oneShot)
     // 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() )
+    if ( TimerMap().find(m_id) != TimerMap().end() )
     {
         wxLogError(_("Timer creation failed."));
 
@@ -113,7 +116,7 @@ bool wxTimer::Start(int milliseconds, bool oneShot)
         return false;
     }
 
-    g_timerMap[m_id] = this;
+    TimerMap()[m_id] = this;
 
     return true;
 }
@@ -124,7 +127,7 @@ void wxTimer::Stop()
     {
         ::KillTimer(NULL, m_id);
 
-        g_timerMap.erase(m_id);
+        TimerMap().erase(m_id);
     }
 
     m_id = 0;
@@ -147,15 +150,14 @@ void wxProcessTimer(wxTimer& timer)
 void WINAPI
 wxTimerProc(HWND WXUNUSED(hwnd),
             UINT WXUNUSED(msg),
-            UINT idTimer,
+            UINT_PTR idTimer,
             DWORD WXUNUSED(dwTime))
 {
-    wxTimerMap::iterator node = g_timerMap.find(idTimer);
+    wxTimerMap::iterator node = TimerMap().find((unsigned long)idTimer);
 
-    wxCHECK_RET( node != g_timerMap.end(), wxT("bogus timer id in wxTimerProc") );
+    wxCHECK_RET( node != TimerMap().end(), wxT("bogus timer id in wxTimerProc") );
 
     wxProcessTimer(*(node->second));
 }
 
 #endif // wxUSE_TIMER
-