Removed WXWIN_COMPATIBILITY_2_2 together with code guarded by it.

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

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index 292dfbb1f9f22a8fa7b8ce796af4ef9e848c5c47..cb2d9518ccaef8046fe2b9f9efea3f938f6be15c 100644 (file)
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -31,18 +31,46 @@
 #include <sys/types.h>
 
 #include <sys/timeb.h>
 #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
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 

-wxList wxTimerList(wxKEY_INTEGER);
+// timer callback used for all timers

 ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 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()
 {
 
 void wxTimer::Init()
 {


@@ -51,9 +79,7 @@ void wxTimer::Init()
 
 wxTimer::~wxTimer()
 {
 
 wxTimer::~wxTimer()
 {

-    Stop();

     wxTimer::Stop();
     wxTimer::Stop();

-    wxTimerList.DeleteObject(this);

 }
 
 void wxTimer::Notify()
 }
 
 void wxTimer::Notify()


@@ -65,7 +91,7 @@ void wxTimer::Notify()
     //
     wxCHECK_RET( m_owner, _T("wxTimer::Notify() should be overridden.") );
 
     //
     wxCHECK_RET( m_owner, _T("wxTimer::Notify() should be overridden.") );
 

-    wxTimerEvent                    vEvent( m_ulId
+    wxTimerEvent                    vEvent( m_idTimer

                                            ,m_milli
                                           );
 
                                            ,m_milli
                                           );
 


@@ -83,22 +109,42 @@ bool wxTimer::Start(
 
     wxCHECK_MSG( m_milli > 0L, FALSE, wxT("invalid value for timer") );
 
 
     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
-                             ,NULLHANDLE
-                             ,0
-                             ,(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)
     {
     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
     {
     }
     else
     {


@@ -112,9 +158,18 @@ void wxTimer::Stop()
 {
     if ( m_ulId )
     {
 {
     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;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -144,11 +199,11 @@ ULONG wxTimerProc(
 , ULONG
 )
 {
 , 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;
 }
 
     return 0;
 }