[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

[wxWidgets.git] / src / os2 / timer.cpp

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index d3c2fdff27053130fc9987a39035401d5afd2f9c..7aa78227b3db7311cb004190db8fc8ad07e6ff92 100644 (file)
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -9,6 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifdef __GNUG__
+    #pragma implementation "timer.h"
+#endif
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -31,18 +35,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()
 {
@@ -51,11 +83,25 @@ void wxTimer::Init()
 
 wxTimer::~wxTimer()
 {
-    Stop();
     wxTimer::Stop();
-    wxTimerList.DeleteObject(this);
 }
 
+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.") );
+
+    wxTimerEvent                    vEvent( m_idTimer
+                                           ,m_milli
+                                          );
+
+    (void)m_owner->ProcessEvent(vEvent);
+} // end of wxTimer::Notify
+
 bool wxTimer::Start(
   int                               nMilliseconds
 , bool                              bOneShot
@@ -67,22 +113,42 @@ bool wxTimer::Start(
 
     wxCHECK_MSG( m_milli > 0L, FALSE, wxT("invalid value for timer") );
 
-    wxTimerList.DeleteObject(this);
+    wxWindow*                       pWin = NULL;
 
-    //
-    // Create a windowless timer
-    //
-    m_ulId = ::WinStartTimer( m_Hab
-                             ,NULL
-                             ,(m_ulId ? m_ulId : 1L)
-                             ,(ULONG)nMilliseconds
-                            );
+    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
+                                );
     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
     {
@@ -96,8 +162,16 @@ void wxTimer::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;
 }
@@ -129,11 +203,11 @@ ULONG wxTimerProc(
 , ULONG
 )
 {
-    wxNode*                         pNode = wxTimerList.Find((ULONG)nIdTimer);
-
-    wxCHECK_MSG(pNode, 0, wxT("bogus timer id in wxTimerProc") );
+    wxTimerMap::iterator node = TimerMap().find((ULONG)nIdTimer);
 
-    wxProcessTimer(*(wxTimer *)pNode->Data());
+    wxCHECK_MSG(node != TimerMap().end(), 0,
+                wxT("bogus timer id in wxTimerProc") );
+    wxProcessTimer(*(node->second));
     return 0;
 }