adding explicit log.h include

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

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index 1aebce5ee143222539b25e8c9eb994e45cc0517b..764afc22abefd3ae8b06e486e868733dca556117 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:


@@ -9,87 +9,67 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "timer.h"
-#endif
-

 // 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/os2/private/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 functions
-// ----------------------------------------------------------------------------
-
-wxList wxTimerList(wxKEY_INTEGER);
-ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// macros
+// private globals

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
+// 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);

 
 

-void wxTimer::Init()
+// 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()

 {
 {

-    m_ulId = 0;
-}
-
-wxTimer::~wxTimer()
-{
-    wxTimer::Stop();
+    static wxTimerMap s_timerMap;

 
 

-    wxTimerList.DeleteObject(this);
+    return s_timerMap;

 }
 
 }
 

-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
-                                          );
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------

 
 

-    (void)m_owner->ProcessEvent(vEvent);
-} // end of wxTimer::Notify
+// timer callback used for all timers
+ULONG wxTimerProc(HWND hwnd, ULONG, int nIdTimer, ULONG);

 
 

-bool wxTimer::Start(
-  int                               nMilliseconds
-, bool                              bOneShot
-)
-{
-    (void)wxTimerBase::Start( nMilliseconds
-                             ,bOneShot
-                            );
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-    wxCHECK_MSG( m_milli > 0L, FALSE, wxT("invalid value for timer") );
+// ----------------------------------------------------------------------------
+// wxTimer class
+// ----------------------------------------------------------------------------

 
 

-    wxTimerList.DeleteObject(this);
+bool wxOS2TimerImpl::Start( int nMilliseconds, bool bOneShot )
+{
+    if ( !wxTimerImpl::Start( nMilliseconds, bOneShot ) )
+        return false;

 
 

-    wxWindow*                       pWin = NULL;
+    wxWindow* pWin = NULL;

 
     if (m_owner)
     {
 
     if (m_owner)
     {


@@ -101,27 +81,43 @@ bool wxTimer::Start(
                                 );
     }
     else
                                 );
     }
     else

+    {

         m_ulId = ::WinStartTimer( m_Hab
                                  ,NULLHANDLE
                                  ,0
                                  ,(ULONG)nMilliseconds
                                 );
         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
     {
         wxLogSysError(_("Couldn't create a timer"));
 
     }
     else
     {
         wxLogSysError(_("Couldn't create a timer"));
 

-        return(FALSE);
+        return false;

     }
 }
 
     }
 }
 

-void wxTimer::Stop()
+void wxOS2TimerImpl::Stop()

 {
     if ( m_ulId )
     {
 {
     if ( m_ulId )
     {


@@ -133,7 +129,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;
 }


@@ -143,7 +140,7 @@ void wxTimer::Stop()
 // ----------------------------------------------------------------------------
 
 void wxProcessTimer(
 // ----------------------------------------------------------------------------
 
 void wxProcessTimer(

-  wxTimer&                          rTimer
+  wxOS2TimerImpl&                          rTimer

 )
 {
     //
 )
 {
     //


@@ -165,11 +162,10 @@ ULONG wxTimerProc(
 , ULONG
 )
 {
 , 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->GetData());
+    wxCHECK_MSG(node != TimerMap().end(), 0,
+                wxT("bogus timer id in wxTimerProc") );
+    wxProcessTimer(*(node->second));

     return 0;
 }
     return 0;
 }

-