xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 99cd51d92a116289d66b197d5e55a76dfb4f2dd6..cccb8ed09fc7634b5468a4eb6706ca60e85ef3f5 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -5,109 +5,153 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // 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__
-#pragma implementation "timer.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma implementation "timer.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_TIMER
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/app.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
 
 #endif
 

+#include "wx/hashmap.h"
+

 #include "wx/timer.h"
 #include "wx/timer.h"

+

 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"
 

-#include <time.h>
-#include <sys/types.h>
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------

 
 

-#if !defined(__SC__) && !defined(__GNUWIN32__)
-#include <sys/timeb.h>
-#endif
-#ifdef __WIN32__
-#define _EXPORT /**/
-#else
-#define _EXPORT _export
-#endif
+WX_DECLARE_HASH_MAP( long,
+                     wxTimer *,
+                     wxIntegerHash,
+                     wxIntegerEqual,
+                     wxTimerMap );

 
 

-wxList wxTimerList(wxKEY_INTEGER);
-UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
+wxTimerMap wxTimerList;

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+void WINAPI wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
+// should probably be in wx/msw/missing.h
+#ifdef __WXMICROWIN__
+    #define MakeProcInstance(proc, hinst) proc

 #endif
 
 #endif
 

-wxTimer::wxTimer(void)
+IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxTimer class
+// ----------------------------------------------------------------------------
+
+void wxTimer::Init()

 {
 {

-  milli = 0 ;
-  lastMilli = -1 ;
-  id = 0;
+    m_id = 0;

 }
 
 }
 

-wxTimer::~wxTimer(void)
+wxTimer::~wxTimer()

 {
 {

-  Stop();
+    long id = m_id;

 
 

-  wxTimerList.DeleteObject(this);
+    wxTimer::Stop();
+
+    wxTimerList.erase(id);

 }
 
 }
 

-bool wxTimer::Start(int milliseconds,bool mode)
+bool wxTimer::Start(int milliseconds, bool oneShot)

 {
 {

-  oneShot = mode ;
-  if (milliseconds < 0)
-    milliseconds = lastMilli;
-
-  if (milliseconds <= 0)
-    return FALSE;
-
-  lastMilli = milli = milliseconds;
-
-  wxTimerList.DeleteObject(this);
-  TIMERPROC wxTimerProcInst = (TIMERPROC) MakeProcInstance((FARPROC)wxTimerProc,
-                                          wxGetInstance());
-
-  id = SetTimer(NULL, (UINT)(id ? id : 1), (UINT)milliseconds, wxTimerProcInst);
-  if (id > 0)
-  {
-    wxTimerList.Append(id, this);
-    return TRUE;
-  }
-  else return FALSE;
+    (void)wxTimerBase::Start(milliseconds, oneShot);
+
+    wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeour") );
+
+#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());
+
+    m_id = ::SetTimer(NULL, (UINT)(m_id ? m_id : 1),
+                      (UINT)m_milli, wxTimerProcInst);
+#endif
+
+    if ( m_id > 0 )
+    {
+        wxTimerList[m_id] = this;
+
+        return true;
+    }
+    else
+    {
+        wxLogSysError(_("Couldn't create a timer"));
+
+        return false;
+    }
+}
+
+void wxTimer::Stop()
+{
+    if ( m_id )
+    {
+        ::KillTimer(NULL, (UINT)m_id);
+
+        wxTimerList.erase(m_id);
+    }
+
+    m_id = 0;

 }
 
 }
 

-void wxTimer::Stop(void)
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+void wxProcessTimer(wxTimer& timer)

 {
 {

-  if (id) {
-    KillTimer(NULL, (UINT)id);
-    wxTimerList.DeleteObject(this); /* @@@@ */
-  }
-  id = 0 ;
-  milli = 0 ;
+    // Avoid to process spurious timer events
+    if ( timer.m_id == 0)
+        return;
+
+    if ( timer.IsOneShot() )
+        timer.Stop();
+
+    timer.Notify();

 }
 
 }
 

-UINT WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
+void WINAPI wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)

 {
 {

-  wxNode *node = wxTimerList.Find((long)idTimer);
-  if (node)
-  {
-    wxTimer *timer = (wxTimer *)node->Data();
-    if (timer->id==0)
-      return(0) ; // Avoid to process spurious timer events
-    if (timer->oneShot)
-      timer->Stop() ;
-    timer->Notify();
-  }
-  return 0;
+    
+    wxTimerMap::iterator node = wxTimerList.find((long)idTimer);
+
+    wxASSERT_MSG( node != wxTimerList.end(), wxT("bogus timer id in wxTimerProc") );
+
+    wxProcessTimer(*(node->second));

 }
 
 }
 

+#endif // wxUSE_TIMER
+