From: Vadim Zeitlin Date: Mon, 15 Jun 2009 17:14:50 +0000 (+0000) Subject: use WPARAM (which is 64 bit under Win64) for timer ids instead of long (which is... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/491acfc75e9bf12806e177b655f3fb7df53e7602 use WPARAM (which is 64 bit under Win64) for timer ids instead of long (which is still 32 bit) (see #10896) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/msw/private/timer.h b/include/wx/msw/private/timer.h index f7044e0754..7878c77a67 100644 --- a/include/wx/msw/private/timer.h +++ b/include/wx/msw/private/timer.h @@ -26,7 +26,7 @@ public: virtual bool IsRunning() const { return m_id != 0; } protected: - unsigned long m_id; + WPARAM m_id; }; #endif // wxUSE_TIMER diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index 48d24f04d0..9442d09a5b 100644 --- a/src/msw/timer.cpp +++ b/src/msw/timer.cpp @@ -38,7 +38,7 @@ // define a hash containing all the timers: it is indexed by timer id and // contains the corresponding timer -WX_DECLARE_HASH_MAP(unsigned long, wxMSWTimerImpl *, wxIntegerHash, wxIntegerEqual, +WX_DECLARE_HASH_MAP(WPARAM, wxMSWTimerImpl *, wxIntegerHash, wxIntegerEqual, wxTimerMap); // instead of using a global here, wrap it in a static function as otherwise it @@ -173,7 +173,7 @@ LRESULT APIENTRY _EXPORT wxTimerWndProc(HWND hWnd, UINT message, { if ( message == WM_TIMER ) { - wxTimerMap::iterator node = TimerMap().find((unsigned long)wParam); + wxTimerMap::iterator node = TimerMap().find(wParam); wxCHECK_MSG( node != TimerMap().end(), 0, wxT("bogus timer id in wxTimerProc") );