X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/272ebf16f85536aced3277ebd69e0c70eabf8d0a..bd1a4a99fc1bec4ac5d0b14379dc5345d6ce3253:/src/os2/timer.cpp

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index f102ace512..8c322fbb38 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:
@@ -9,23 +9,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-    #pragma implementation "timer.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/window.h"
-#include "wx/os2/private.h"
-
 #ifndef WX_PRECOMP
-    #include "wx/setup.h"
+    #include "wx/window.h"
     #include "wx/list.h"
     #include "wx/event.h"
     #include "wx/app.h"
 #endif
 
+#include "wx/os2/private.h"
 #include "wx/intl.h"
 #include "wx/log.h"
 
@@ -35,18 +29,46 @@
 #include <sys/types.h>
 
 #include <sys/timeb.h>
+
+// ----------------------------------------------------------------------------
+// private globals
+// ----------------------------------------------------------------------------
+
+// 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);
+
+// 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;
+}
+
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
-wxList wxTimerList(wxKEY_INTEGER);
+// timer callback used for all timers
 ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxTimer class
+// ----------------------------------------------------------------------------
 
 void wxTimer::Init()
 {
@@ -56,8 +78,6 @@ void wxTimer::Init()
 wxTimer::~wxTimer()
 {
     wxTimer::Stop();
-
-    wxTimerList.DeleteObject(this);
 }
 
 void wxTimer::Notify()
@@ -87,8 +107,6 @@ bool wxTimer::Start(
 
     wxCHECK_MSG( m_milli > 0L, FALSE, wxT("invalid value for timer") );
 
-    wxTimerList.DeleteObject(this);
-
     wxWindow*                       pWin = NULL;
 
     if (m_owner)
@@ -108,10 +126,23 @@ bool wxTimer::Start(
                                 );
     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
     {
@@ -133,7 +164,8 @@ void wxTimer::Stop()
         }
         else
             ::WinStopTimer(m_Hab, NULLHANDLE, m_ulId);
-        wxTimerList.DeleteObject(this);
+
+        TimerMap().erase(m_ulId);
     }
     m_ulId = 0L;
 }
@@ -165,11 +197,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") );
-    if (pNode)
-      wxProcessTimer(*(wxTimer *)pNode->Data());
+    wxCHECK_MSG(node != TimerMap().end(), 0,
+                wxT("bogus timer id in wxTimerProc") );
+    wxProcessTimer(*(node->second));
     return 0;
 }
-