corrected CodeWarrior project target names and generated application names

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

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index e999fd6924d260e6e3c3af6fb3f85d12c1923726..17f1c1755262b12c6e436c86148cde384a3162bb 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -82,11 +82,18 @@ bool wxTimer::Start(int milliseconds, bool oneShot)
     wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeour") );
 
     wxTimerList.DeleteObject(this);
     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);
+#else

     TIMERPROC wxTimerProcInst = (TIMERPROC)
         MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
 
     m_id = SetTimer(NULL, (UINT)(m_id ? m_id : 1),
                     (UINT)milliseconds, wxTimerProcInst);
     TIMERPROC wxTimerProcInst = (TIMERPROC)
         MakeProcInstance((FARPROC)wxTimerProc, wxGetInstance());
 
     m_id = SetTimer(NULL, (UINT)(m_id ? m_id : 1),
                     (UINT)milliseconds, wxTimerProcInst);

+#endif
+

     if ( m_id > 0 )
     {
         wxTimerList.Append(m_id, this);
     if ( m_id > 0 )
     {
         wxTimerList.Append(m_id, this);