X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ed0fac8a854bf53ea942ba7d759519f0c681763..404b319a85dadd7decf7a5a5331020520031a41c:/src/os2/timer.cpp?ds=sidebyside

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index 6ae0e005b0..764afc22ab 100644
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.cpp
+// Name:        src/os2/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      David Webster
 // Modified by:
@@ -12,20 +12,18 @@
 // 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>
@@ -33,74 +31,106 @@
 #include <sys/timeb.h>
 
 // ----------------------------------------------------------------------------
-// private functions
+// private globals
 // ----------------------------------------------------------------------------
 
-wxList wxTimerList(wxKEY_INTEGER);
-ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
+// 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);
+
+// 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()
+{
+    static wxTimerMap s_timerMap;
+
+    return s_timerMap;
+}
 
 // ----------------------------------------------------------------------------
-// macros
+// private functions
 // ----------------------------------------------------------------------------
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
-#endif
-
-wxTimer::wxTimer()
-{
-    m_ulId = 0;
-}
+// timer callback used for all timers
+ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
 
-wxTimer::~wxTimer()
-{
-    Stop();
+// ============================================================================
+// implementation
+// ============================================================================
 
-    wxTimerList.DeleteObject(this);
-}
+// ----------------------------------------------------------------------------
+// wxTimer class
+// ----------------------------------------------------------------------------
 
-bool wxTimer::Start(
-  int                               nMilliseconds
-, bool                              bOneShot
-)
+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
-                             ,NULL
-                             ,(m_ulId ? m_ulId : 1L)
-                             ,(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;
 }
@@ -110,7 +140,7 @@ void wxTimer::Stop()
 // ----------------------------------------------------------------------------
 
 void wxProcessTimer(
-  wxTimer&                          rTimer
+  wxOS2TimerImpl&                          rTimer
 )
 {
     //
@@ -132,11 +162,10 @@ ULONG wxTimerProc(
 , 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;
 }
-