X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24a21a5f1db94e67594b1dbd001e3696792d5d73..1fd850ab550a30bc600d5a10c5aed5386bf3624b:/src/msw/timer.cpp?ds=inline diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index e5e42f4a6a..21f40cfb03 100644 --- a/src/msw/timer.cpp +++ b/src/msw/timer.cpp @@ -31,6 +31,7 @@ #endif #include "wx/msw/private.h" +#include "wx/msw/private/hiddenwin.h" // ---------------------------------------------------------------------------- // private globals @@ -38,7 +39,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 @@ -51,6 +52,24 @@ static wxTimerMap& TimerMap() return s_timerMap; } +// This gets a unique, non-zero timer ID and creates an entry in the TimerMap +UINT_PTR GetNewTimerId(wxMSWTimerImpl *t) +{ + static UINT_PTR lastTimerId = 0; + + while (lastTimerId == 0 || + TimerMap().find(lastTimerId) != TimerMap().end()) + { + lastTimerId = lastTimerId + 1; + } + + TimerMap()[lastTimerId] = t; + + return lastTimerId; +} + + + // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- @@ -58,11 +77,6 @@ static wxTimerMap& TimerMap() LRESULT APIENTRY _EXPORT wxTimerWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); -// implemented in utils.cpp -extern "C" WXDLLIMPEXP_BASE HWND -wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc); - - // ---------------------------------------------------------------------------- // wxTimerHiddenWindowModule: used to manage the hidden window used for // catching timer messages (we need a module to ensure that the window is @@ -105,46 +119,31 @@ bool wxMSWTimerImpl::Start(int milliseconds, bool oneShot) if ( !wxTimerImpl::Start(milliseconds, oneShot) ) return false; - m_id = ::SetTimer( - wxTimerHiddenWindowModule::GetHWND(), // window to send the messages to - GetId(), // timer ID - (UINT)m_milli, // delay - NULL // timer proc. Not used since we pass hwnd - ); - - if ( !m_id ) + m_id = GetNewTimerId(this); + // SetTimer() normally returns just idTimer but this might change in the + // future so use its return value to be safe + UINT_PTR ret = ::SetTimer + ( + wxTimerHiddenWindowModule::GetHWND(), // window for WM_TIMER + m_id, // timer ID to create + (UINT)m_milli, // delay + NULL // timer proc (unused) + ); + + if ( ret == 0 ) { wxLogSysError(_("Couldn't create a timer")); return false; } - // check that SetTimer() didn't reuse an existing id: according to the MSDN - // this can happen and this would be catastrophic to us as we rely on ids - // uniquely identifying the timers because we use them as keys in the hash - if ( TimerMap().find(m_id) != TimerMap().end() ) - { - wxLogError(_("Timer creation failed.")); - - ::KillTimer(wxTimerHiddenWindowModule::GetHWND(), m_id); - m_id = 0; - - return false; - } - - TimerMap()[m_id] = this; - return true; } void wxMSWTimerImpl::Stop() { - wxASSERT_MSG( m_id, _T("should be running") ); - ::KillTimer(wxTimerHiddenWindowModule::GetHWND(), m_id); - TimerMap().erase(m_id); - m_id = 0; } @@ -154,7 +153,7 @@ void wxMSWTimerImpl::Stop() void wxProcessTimer(wxMSWTimerImpl& timer) { - wxASSERT_MSG( timer.IsRunning(), _T("bogus timer id") ); + wxASSERT_MSG( timer.IsRunning(), wxT("bogus timer id") ); if ( timer.IsOneShot() ) timer.Stop(); @@ -168,17 +167,19 @@ 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") ); + if ( node != TimerMap().end() ) + { + wxProcessTimer(*(node->second)); - wxProcessTimer(*(node->second)); - } - else - { - return ::DefWindowProc(hWnd, message, wParam, lParam); + return 0; + } + //else: Unknown timer, probably one of our timers that had fired just + // before being removed from the timers map by Stop(). } - return 0; + + return ::DefWindowProc(hWnd, message, wParam, lParam); } // ---------------------------------------------------------------------------- @@ -206,7 +207,7 @@ void wxTimerHiddenWindowModule::OnExit() { if ( !::DestroyWindow(ms_hwnd) ) { - wxLogLastError(_T("DestroyWindow(wxTimerHiddenWindow)")); + wxLogLastError(wxT("DestroyWindow(wxTimerHiddenWindow)")); } ms_hwnd = NULL; @@ -216,7 +217,7 @@ void wxTimerHiddenWindowModule::OnExit() { if ( !::UnregisterClass(ms_className, wxGetInstance()) ) { - wxLogLastError(_T("UnregisterClass(\"wxTimerHiddenWindow\")")); + wxLogLastError(wxT("UnregisterClass(\"wxTimerHiddenWindow\")")); } ms_className = NULL; @@ -226,7 +227,7 @@ void wxTimerHiddenWindowModule::OnExit() /* static */ HWND wxTimerHiddenWindowModule::GetHWND() { - static const wxChar *HIDDEN_WINDOW_CLASS = _T("wxTimerHiddenWindow"); + static const wxChar *HIDDEN_WINDOW_CLASS = wxT("wxTimerHiddenWindow"); if ( !ms_hwnd ) { ms_hwnd = wxCreateHiddenWindow(&ms_className, HIDDEN_WINDOW_CLASS,