X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2432b92dd7a837db13d3938a56c1959decd03203..f35746ceeda33434574d667f81d7e6e8b18b7c46:/src/msw/timer.cpp

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 0842be5308..2c9f4d79e3 100644
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -20,47 +20,54 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_TIMER
+
 #ifndef WX_PRECOMP
-    #include "wx/setup.h"
+    #include "wx/window.h"
     #include "wx/list.h"
     #include "wx/event.h"
     #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
 #endif
 
-#include "wx/intl.h"
-#include "wx/log.h"
+#include "wx/hashmap.h"
 
 #include "wx/timer.h"
-#include "wx/msw/private.h"
-
-#include <time.h>
-#include <sys/types.h>
 
-#if !defined(__SC__) && !defined(__GNUWIN32__) && !defined(__MWERKS__)
-    #include <sys/timeb.h>
-#endif
+#include "wx/msw/private.h"
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
-wxList wxTimerList(wxKEY_INTEGER);
-UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
+WX_DECLARE_HASH_MAP( long,
+                     wxTimer *,
+                     wxIntegerHash,
+                     wxIntegerEqual,
+                     wxTimerMap );
+
+wxTimerMap wxTimerList;
+
+void WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 #ifdef __WIN32__
-    #define _EXPORT /**/
+    #define _EXPORT
 #else
     #define _EXPORT _export
 #endif
 
-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+// should probably be in wx/msw/private.h
+#ifdef __WXMICROWIN__
+    #define MakeProcInstance(proc, hinst) proc
 #endif
 
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -68,82 +75,90 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
 // ----------------------------------------------------------------------------
 // wxTimer class
 // ----------------------------------------------------------------------------
-wxTimer::wxTimer(void)
+
+void wxTimer::Init()
 {
-    milli = 0 ;
-    lastMilli = -1 ;
-    id = 0;
+    m_id = 0;
 }
 
-wxTimer::~wxTimer(void)
+wxTimer::~wxTimer()
 {
-    Stop();
+    long id = m_id;
+
+    wxTimer::Stop();
 
-    wxTimerList.DeleteObject(this);
+    wxTimerList.erase(id);
 }
 
-bool wxTimer::Start(int milliseconds, bool mode)
+bool wxTimer::Start(int milliseconds, bool oneShot)
 {
-    oneShot = mode ;
-    if (milliseconds < 0)
-        milliseconds = lastMilli;
+    (void)wxTimerBase::Start(milliseconds, oneShot);
 
-    wxCHECK_MSG( milliseconds > 0, FALSE, "invalid value for timer timeour" );
+    wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeour") );
 
-    lastMilli = milli = milliseconds;
-
-    wxTimerList.DeleteObject(this);
+#ifdef __WXWINCE__
+    m_id = ::SetTimer(NULL, (UINT)(m_id ? m_id : 1),
+                      (UINT)m_milli, (TIMERPROC) wxTimerProc);
+#else
     TIMERPROC wxTimerProcInst = (TIMERPROC)
         MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
 
-    id = SetTimer(NULL, (UINT)(id ? id : 1),
-                  (UINT)milliseconds, wxTimerProcInst);
-    if (id > 0)
+    m_id = ::SetTimer(NULL, (UINT)(m_id ? m_id : 1),
+                      (UINT)m_milli, wxTimerProcInst);
+#endif
+
+    if ( m_id > 0 )
     {
-        wxTimerList.Append(id, this);
+        wxTimerList[m_id] = this;
 
-        return TRUE;
+        return true;
     }
     else
     {
         wxLogSysError(_("Couldn't create a timer"));
 
-        return FALSE;
+        return false;
     }
 }
 
-void wxTimer::Stop(void)
+void wxTimer::Stop()
 {
-    if (id) {
-        KillTimer(NULL, (UINT)id);
-        wxTimerList.DeleteObject(this); /* @@@@ */
+    if ( m_id )
+    {
+        ::KillTimer(NULL, (UINT)m_id);
+
+        wxTimerList.erase(m_id);
     }
-    id = 0 ;
-    milli = 0 ;
+
+    m_id = 0;
 }
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
+
 void wxProcessTimer(wxTimer& timer)
 {
     // Avoid to process spurious timer events
-    if ( timer.id == 0)
+    if ( timer.m_id == 0)
         return;
 
-    if ( timer.oneShot )
+    if ( timer.IsOneShot() )
         timer.Stop();
 
     timer.Notify();
 }
 
-UINT WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
+void WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
 {
-    wxNode *node = wxTimerList.Find((long)idTimer);
+    
+    wxTimerMap::iterator node = wxTimerList.find((long)idTimer);
 
-    wxCHECK_MSG( node, 0, "bogus timer id in wxTimerProc" );
+    wxASSERT_MSG( node != wxTimerList.end(), wxT("bogus timer id in wxTimerProc") );
 
-    wxProcessTimer(*(wxTimer *)node->Data());
+    wxProcessTimer(*(node->second));
 
-    return 0;
+    // return 0;
 }
+
+#endif // wxUSE_TIMER