X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d20f7ae50a3238d3846052bee83d47ba7ced735..1d6560d796aefb5dbdf217109767b1054c68c291:/src/msw/timer.cpp

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 883f67bfa2..348f147c1e 100644
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -83,7 +83,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
              (
@@ -150,7 +150,7 @@ wxTimerProc(HWND WXUNUSED(hwnd),
             UINT idTimer,
             DWORD WXUNUSED(dwTime))
 {
-    wxTimerMap::iterator node = g_timerMap.find(idTimer);
+    wxTimerMap::iterator node = g_timerMap.find((unsigned long)idTimer);
 
     wxCHECK_RET( node != g_timerMap.end(), wxT("bogus timer id in wxTimerProc") );