/////////////////////////////////////////////////////////////////////////////
-// Name: timer.cpp
+// Name: src/os2/timer.cpp
// Purpose: wxTimer implementation
// Author: David Webster
// Modified by:
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#include "wx/window.h"
-#include "wx/os2/private.h"
+#include "wx/os2/private/timer.h"
#ifndef WX_PRECOMP
- #include "wx/setup.h"
#include "wx/list.h"
+ #include "wx/window.h"
#include "wx/event.h"
#include "wx/app.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
#endif
-#include "wx/intl.h"
-#include "wx/log.h"
-
-#include "wx/timer.h"
+#include "wx/os2/private.h"
#include <time.h>
#include <sys/types.h>
#include <sys/timeb.h>
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
-
-wxList wxTimerList(wxKEY_INTEGER);
-ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
// ----------------------------------------------------------------------------
-// macros
+// private globals
// ----------------------------------------------------------------------------
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+// define a hash containing all the timers: it is indexed by timer id and
+// contains the corresponding timer
+WX_DECLARE_HASH_MAP(unsigned long, wxOS2TimerImpl *, wxIntegerHash, wxIntegerEqual,
+ wxTimerMap);
-void wxTimer::Init()
+// instead of using a global here, wrap it in a static function as otherwise it
+// could have been used before being initialized if a timer object were created
+// globally
+static wxTimerMap& TimerMap()
{
- m_ulId = 0;
-}
+ static wxTimerMap s_timerMap;
-wxTimer::~wxTimer()
-{
- Stop();
- wxTimer::Stop();
- wxTimerList.DeleteObject(this);
+ return s_timerMap;
}
-void wxTimer::Notify()
-{
- //
- // The base class version generates an event if it has owner - which it
- // should because otherwise nobody can process timer events, but it does
- // not use the OS's ID, which OS/2 must have to figure out which timer fired
- //
- wxCHECK_RET( m_owner, _T("wxTimer::Notify() should be overridden.") );
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
- wxTimerEvent vEvent( m_ulId
- ,m_milli
- );
+// timer callback used for all timers
+ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
- (void)m_owner->ProcessEvent(vEvent);
-} // end of wxTimer::Notify
+// ============================================================================
+// implementation
+// ============================================================================
-bool wxTimer::Start(
- int nMilliseconds
-, bool bOneShot
-)
+// ----------------------------------------------------------------------------
+// wxTimer class
+// ----------------------------------------------------------------------------
+
+bool wxOS2TimerImpl::Start( int nMilliseconds, bool bOneShot )
{
- (void)wxTimerBase::Start( nMilliseconds
- ,bOneShot
- );
+ if ( !wxTimerImpl::Start( nMilliseconds, bOneShot ) )
+ return false;
- wxCHECK_MSG( m_milli > 0L, FALSE, wxT("invalid value for timer") );
+ wxWindow* pWin = NULL;
- wxTimerList.DeleteObject(this);
+ if (m_owner)
+ {
+ pWin = (wxWindow*)m_owner;
+ m_ulId = ::WinStartTimer( m_Hab
+ ,pWin->GetHWND()
+ ,m_idTimer
+ ,(ULONG)nMilliseconds
+ );
+ }
+ else
+ {
+ m_ulId = ::WinStartTimer( m_Hab
+ ,NULLHANDLE
+ ,0
+ ,(ULONG)nMilliseconds
+ );
+ }
- //
- // Create a windowless timer
- //
- m_ulId = ::WinStartTimer( m_Hab
- ,NULLHANDLE
- ,0
- ,(ULONG)nMilliseconds
- );
if (m_ulId > 0L)
{
- wxTimerList.Append( m_ulId
- ,this
- );
- return(TRUE);
+ // 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_ulId) != TimerMap().end() )
+ {
+ wxLogError(_("Timer creation failed."));
+
+ ::WinStopTimer(m_Hab, pWin?(pWin->GetHWND()):NULL, m_ulId);
+ m_ulId = 0;
+
+ return false;
+ }
+
+ TimerMap()[m_ulId] = this;
+
+ return true;
}
else
{
wxLogSysError(_("Couldn't create a timer"));
- return(FALSE);
+ return false;
}
}
-void wxTimer::Stop()
+void wxOS2TimerImpl::Stop()
{
if ( m_ulId )
{
- ::WinStopTimer(m_Hab, NULL, m_ulId);
- wxTimerList.DeleteObject(this);
+ if (m_owner)
+ {
+ wxWindow* pWin = (wxWindow*)m_owner;
+
+ ::WinStopTimer(m_Hab, pWin->GetHWND(), m_ulId);
+ }
+ else
+ ::WinStopTimer(m_Hab, NULLHANDLE, m_ulId);
+
+ TimerMap().erase(m_ulId);
}
+ m_ulId = 0L;
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
void wxProcessTimer(
- wxTimer& rTimer
+ wxOS2TimerImpl& rTimer
)
{
//
, ULONG
)
{
- wxNode* pNode = wxTimerList.Find((ULONG)nIdTimer);
+ wxTimerMap::iterator node = TimerMap().find((ULONG)nIdTimer);
- wxCHECK_MSG(pNode, 0, wxT("bogus timer id in wxTimerProc") );
-
- wxProcessTimer(*(wxTimer *)pNode->Data());
+ wxCHECK_MSG(node != TimerMap().end(), 0,
+ wxT("bogus timer id in wxTimerProc") );
+ wxProcessTimer(*(node->second));
return 0;
}
-
projects / wxWidgets.git / blobdiff