don't waste time updating state of tools in a hidden toolbar (patch 1612415)

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

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index bb897e1f78b3c53b8595699047657e2e629d41f0..6d2a8c071db39d856df2f90ab3bc88e53eb07e98 100644 (file)
--- 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:
 // Purpose:     wxTimer implementation
 // Author:      David Webster
 // Modified by:


@@ -12,37 +12,63 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/window.h"
-#include "wx/os2/private.h"
+#include "wx/timer.h"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-    #include "wx/setup.h"

     #include "wx/list.h"
     #include "wx/list.h"

+    #include "wx/window.h"

     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/event.h"
     #include "wx/app.h"

+    #include "wx/intl.h"
+    #include "wx/log.h"

 #endif
 
 #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>
 
 #include <time.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 +77,7 @@ void wxTimer::Init()
 
 wxTimer::~wxTimer()
 {
 
 wxTimer::~wxTimer()
 {

-    Stop();

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

-    wxTimerList.DeleteObject(this);

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


@@ -72,20 +96,13 @@ void wxTimer::Notify()
     (void)m_owner->ProcessEvent(vEvent);
 } // end of wxTimer::Notify
 
     (void)m_owner->ProcessEvent(vEvent);
 } // end of wxTimer::Notify
 

-bool wxTimer::Start(
-  int                               nMilliseconds
-, bool                              bOneShot
-)
+bool wxTimer::Start( int nMilliseconds, bool bOneShot )

 {
 {

-    (void)wxTimerBase::Start( nMilliseconds
-                             ,bOneShot
-                            );
+    (void)wxTimerBase::Start( nMilliseconds, bOneShot );

 
 

-    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;
+    wxWindow* pWin = NULL;

 
     if (m_owner)
     {
 
     if (m_owner)
     {


@@ -104,16 +121,29 @@ bool wxTimer::Start(
                                 );
     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
     {
         wxLogSysError(_("Couldn't create a timer"));
 
     }
     else
     {
         wxLogSysError(_("Couldn't create a timer"));
 

-        return(FALSE);
+        return false;

     }
 }
 
     }
 }
 


@@ -129,7 +159,8 @@ void wxTimer::Stop()
         }
         else
             ::WinStopTimer(m_Hab, NULLHANDLE, m_ulId);
         }
         else
             ::WinStopTimer(m_Hab, NULLHANDLE, m_ulId);

-        wxTimerList.DeleteObject(this);
+
+        TimerMap().erase(m_ulId);

     }
     m_ulId = 0L;
 }
     }
     m_ulId = 0L;
 }


@@ -161,11 +192,10 @@ 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;
 }

-