added wxVALIDATOR_PARAM and use it to avoid warnings about unused validators when...

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

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 17f1c1755262b12c6e436c86148cde384a3162bb..cccb8ed09fc7634b5468a4eb6706ca60e85ef3f5 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -5,11 +5,11 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "timer.h"
 #endif
 
     #pragma implementation "timer.h"
 #endif
 


@@ -23,7 +23,6 @@
 #if wxUSE_TIMER
 
 #ifndef WX_PRECOMP
 #if wxUSE_TIMER
 
 #ifndef WX_PRECOMP

-    #include "wx/setup.h"

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


@@ -32,6 +31,8 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

+#include "wx/hashmap.h"
+

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


@@ -40,17 +41,23 @@
 // private functions
 // ----------------------------------------------------------------------------
 
 // 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 wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);

 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 

-#ifdef __WIN32__
-    #define _EXPORT
-#else
-    #define _EXPORT _export
+// should probably be in wx/msw/missing.h
+#ifdef __WXMICROWIN__
+    #define MakeProcInstance(proc, hinst) proc

 #endif
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
 #endif
 
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)


@@ -70,41 +77,41 @@ void wxTimer::Init()
 
 wxTimer::~wxTimer()
 {
 
 wxTimer::~wxTimer()
 {

+    long id = m_id;
+

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

-    wxTimerList.DeleteObject(this);
+    wxTimerList.erase(id);

 }
 
 bool wxTimer::Start(int milliseconds, bool oneShot)
 {
     (void)wxTimerBase::Start(milliseconds, oneShot);
 
 }
 
 bool wxTimer::Start(int milliseconds, bool oneShot)
 {
     (void)wxTimerBase::Start(milliseconds, oneShot);
 

-    wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeour") );
+    wxCHECK_MSG( m_milli > 0, false, wxT("invalid value for timer timeour") );

 
 

-    wxTimerList.DeleteObject(this);
-
-#ifdef __WXMICROWIN__
-    m_id = SetTimer(NULL, (UINT)(m_id ? m_id : 1),
-                    (UINT)milliseconds, (TIMERPROC) wxTimerProc);
+#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());
 
 #else
     TIMERPROC wxTimerProcInst = (TIMERPROC)
         MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
 

-    m_id = SetTimer(NULL, (UINT)(m_id ? m_id : 1),
-                    (UINT)milliseconds, wxTimerProcInst);
+    m_id = ::SetTimer(NULL, (UINT)(m_id ? m_id : 1),
+                      (UINT)m_milli, wxTimerProcInst);

 #endif
 
     if ( m_id > 0 )
     {
 #endif
 
     if ( m_id > 0 )
     {

-        wxTimerList.Append(m_id, this);
+        wxTimerList[m_id] = this;

 
 

-        return TRUE;
+        return true;

     }
     else
     {
         wxLogSysError(_("Couldn't create a timer"));
 
     }
     else
     {
         wxLogSysError(_("Couldn't create a timer"));
 

-        return FALSE;
+        return false;

     }
 }
 
     }
 }
 


@@ -112,8 +119,9 @@ void wxTimer::Stop()
 {
     if ( m_id )
     {
 {
     if ( m_id )
     {

-        KillTimer(NULL, (UINT)m_id);
-        wxTimerList.DeleteObject(this);
+        ::KillTimer(NULL, (UINT)m_id);
+
+        wxTimerList.erase(m_id);

     }
 
     m_id = 0;
     }
 
     m_id = 0;


@@ -135,15 +143,15 @@ void wxProcessTimer(wxTimer& timer)
     timer.Notify();
 }
 
     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);
+    
+    wxTimerMap::iterator node = wxTimerList.find((long)idTimer);

 
 

-    wxCHECK_MSG( node, 0, wxT("bogus timer id in wxTimerProc") );
+    wxASSERT_MSG( node != wxTimerList.end(), wxT("bogus timer id in wxTimerProc") );

 
 

-    wxProcessTimer(*(wxTimer *)node->Data());
-
-    return 0;
+    wxProcessTimer(*(node->second));

 }
 
 #endif // wxUSE_TIMER
 }
 
 #endif // wxUSE_TIMER

+