use WPARAM (which is 64 bit under Win64) for timer ids instead of long (which is...

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 f7044e07549f79008fbce5f7498788104fe5e2cd..7878c77a6725a8e013949cea075eadb9fda0f3e6 100644 (file)
--- 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:
     virtual bool IsRunning() const { return m_id != 0; }
 
 protected:

-    unsigned long m_id;
+    WPARAM m_id;

 };
 
 #endif // wxUSE_TIMER
 };
 
 #endif // wxUSE_TIMER

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 48d24f04d0a2cf24f385ce5d77523188585dd76d..9442d09a5bc1a7c02d890fe56c5bbffdc922e843 100644 (file)
--- 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
 
 // 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
                     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 )
     {
 {
     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") );
 
 
         wxCHECK_MSG( node != TimerMap().end(), 0, wxT("bogus timer id in wxTimerProc") );