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
This commit is contained in:
@@ -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") );
|
||||
|
||||
|
Reference in New Issue
Block a user