Modified vc.t according to last changes to makefile.vc, and regenerated

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

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 682f66980cc5eebc164e8d0eda987e1d14a4d6aa..b339a8f040e014c290e456a9900e64c469e43db5 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -20,6 +20,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_TIMER
+
 #ifndef WX_PRECOMP
     #include "wx/setup.h"
     #include "wx/window.h"
@@ -51,10 +53,13 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
     #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
 // ============================================================================
@@ -63,7 +68,7 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
 // wxTimer class
 // ----------------------------------------------------------------------------
 
-wxTimer::wxTimer()
+void wxTimer::Init()
 {
     m_id = 0;
 }
@@ -79,25 +84,25 @@ 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);
     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);
+
     if ( m_id > 0 )
     {
         wxTimerList.Append(m_id, this);
 
-        return TRUE;
+        return true;
     }
     else
     {
         wxLogSysError(_("Couldn't create a timer"));
 
-        return FALSE;
+        return false;
     }
 }
 
@@ -105,7 +110,8 @@ void wxTimer::Stop()
 {
     if ( m_id )
     {
-        KillTimer(NULL, (UINT)m_id);
+        ::KillTimer(NULL, (UINT)m_id);
+
         wxTimerList.DeleteObject(this);
     }
 
@@ -134,7 +140,9 @@ UINT WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
 
     wxCHECK_MSG( node, 0, wxT("bogus timer id in wxTimerProc") );
 
-    wxProcessTimer(*(wxTimer *)node->Data());
+    wxProcessTimer(*(wxTimer *)node->GetData());
 
     return 0;
 }
+
+#endif // wxUSE_TIMER