Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use WPARAM (which is 64 bit under Win64) for timer ids instead of long (which is still 32 bit) (see #10896)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-06-15 17:14:50 +00:00
parent 233f10bf15
commit 491acfc75e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/msw/private/timer.h
View File

@@ -26,7 +26,7 @@ public:
virtual bool IsRunning() const { return m_id != 0; } virtual bool IsRunning() const { return m_id != 0; }
protected: protected:
unsigned long m_id; WPARAM m_id;
}; };
#endif // wxUSE_TIMER #endif // wxUSE_TIMER

4
src/msw/timer.cpp
View File

@@ -38,7 +38,7 @@
// define a hash containing all the timers: it is indexed by timer id and // define a hash containing all the timers: it is indexed by timer id and
// contains the corresponding timer // contains the corresponding timer
WX_DECLARE_HASH_MAP(unsigned long, wxMSWTimerImpl *, wxIntegerHash, wxIntegerEqual, WX_DECLARE_HASH_MAP(WPARAM, wxMSWTimerImpl *, wxIntegerHash, wxIntegerEqual,
wxTimerMap); wxTimerMap);
// instead of using a global here, wrap it in a static function as otherwise it // 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") );