X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/caa36aab8425422041c34b9cc573a2e0189db6ed..9da483994bde8bad7d63a82ea06867ee8438d7ad:/src/msw/timer.cpp?ds=sidebyside diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp index 1ebd9535cf..796db83d7a 100644 --- a/src/msw/timer.cpp +++ b/src/msw/timer.cpp @@ -32,72 +32,37 @@ #endif #include "wx/hashmap.h" -#include "wx/module.h" #include "wx/timer.h" #include "wx/msw/private.h" // from utils.cpp -extern "C" HWND +extern "C" WXDLLIMPEXP_BASE HWND wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc); // ---------------------------------------------------------------------------- -// private functions +// private globals // ---------------------------------------------------------------------------- -WX_DECLARE_HASH_MAP( long, - wxTimer *, - wxIntegerHash, - wxIntegerEqual, - wxTimerMap ); - -wxTimerMap wxTimerList; +// define a hash containing all the timers: it is indexed by timer id and +// contains the corresponding timer +WX_DECLARE_HASH_MAP(unsigned long, wxTimer *, wxIntegerHash, wxIntegerEqual, + wxTimerMap); -void WINAPI wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD); - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) +static wxTimerMap g_timerMap; // ---------------------------------------------------------------------------- -// globals +// private functions // ---------------------------------------------------------------------------- -// these variables are for timer shared hwnd management -static const wxChar *wxMSWTIMER_WNDCLASSNAME = wxT("_wxTimer_Internal_Class"); -static LPCTSTR s_classnameTimerWnd = NULL; -static HWND s_hwndTimer = NULL; +void WINAPI wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD); // ---------------------------------------------------------------------------- -// private classes +// macros // ---------------------------------------------------------------------------- -class wxTimerModule : public wxModule -{ -public: - virtual bool OnInit() { return true; } - virtual void OnExit() - { - if ( s_hwndTimer ) - { - ::DestroyWindow(s_hwndTimer); - s_hwndTimer = NULL; - - if ( !::UnregisterClass(wxMSWTIMER_WNDCLASSNAME, wxGetInstance()) ) - { - wxLogLastError(_T("UnregisterClass(wxTimerClass)")); - } - - s_classnameTimerWnd = NULL; - } - } - -private: - DECLARE_DYNAMIC_CLASS(wxTimerModule) -}; +IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject) // ============================================================================ // implementation @@ -110,17 +75,11 @@ private: void wxTimer::Init() { m_id = 0; - m_hwnd = NULL; } wxTimer::~wxTimer() { - // save id as Stop() changes it - long id = m_id; - wxTimer::Stop(); - - wxTimerList.erase(id); } bool wxTimer::Start(int milliseconds, bool oneShot) @@ -129,50 +88,12 @@ bool wxTimer::Start(int milliseconds, bool oneShot) wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeour") ); - // find a window for SetTimer(): it should be a valid HWND owned by this - // thread (even if we had a non NULL m_hwnd before, reset it in case the - // owner has changed) - m_hwnd = NULL; - - // first try the owner window - if ( m_owner ) - { - wxWindow *win = wxDynamicCast(m_owner, wxWindow); - if ( win ) - { - m_hwnd = win->GetHWND(); - } - } - - // if not, use a shared hidden window - if ( !m_hwnd ) - { - if ( !s_hwndTimer ) - { - s_hwndTimer = wxCreateHiddenWindow - ( - &s_classnameTimerWnd, - wxMSWTIMER_WNDCLASSNAME, - ::DefWindowProc - ); - - if ( !s_hwndTimer ) - { - wxASSERT_MSG( s_hwndTimer, wxT("can't create a HWND for wxTimer") ); - return false; - } - } - - m_hwnd = (WXHWND)s_hwndTimer; - - } - m_id = ::SetTimer ( - (HWND)m_hwnd, - (UINT)(m_id ? m_id : 1), - (UINT)m_milli, - (TIMERPROC)wxTimerProc + NULL, // don't use window + 1, // id ignored with NULL hwnd anyhow + (UINT)m_milli, // delay + (TIMERPROC)wxTimerProc // timer proc to call ); if ( !m_id ) @@ -182,7 +103,20 @@ bool wxTimer::Start(int milliseconds, bool oneShot) return false; } - wxTimerList[m_id] = this; + // 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 ( g_timerMap.find(m_id) != g_timerMap.end() ) + { + wxLogError(_("Timer creation failed.")); + + ::KillTimer(NULL, m_id); + m_id = 0; + + return false; + } + + g_timerMap[m_id] = this; return true; } @@ -191,10 +125,9 @@ void wxTimer::Stop() { if ( m_id ) { - ::KillTimer((HWND)m_hwnd, (UINT)m_id); - m_hwnd = NULL; + ::KillTimer(NULL, m_id); - wxTimerList.erase(m_id); + g_timerMap.erase(m_id); } m_id = 0; @@ -206,9 +139,7 @@ void wxTimer::Stop() void wxProcessTimer(wxTimer& timer) { - // Avoid to process spurious timer events - if ( timer.m_id == 0) - return; + wxASSERT_MSG( timer.m_id != 0, _T("bogus timer id") ); if ( timer.IsOneShot() ) timer.Stop(); @@ -218,9 +149,9 @@ void wxProcessTimer(wxTimer& timer) void WINAPI wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD) { - wxTimerMap::iterator node = wxTimerList.find((long)idTimer); + wxTimerMap::iterator node = g_timerMap.find(idTimer); - wxASSERT_MSG( node != wxTimerList.end(), wxT("bogus timer id in wxTimerProc") ); + wxCHECK_RET( node != g_timerMap.end(), wxT("bogus timer id in wxTimerProc") ); wxProcessTimer(*(node->second)); }