load wsock32.dll dynamically, so that wxCore has no dependency on it

[wxWidgets.git] / src / mac / carbon / timer.cpp

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index 3d43a7ca27f3846ecadd399b701452a0efa4fd93..4fcae35e09b381cad17392adba4305d8a1a30af6 100644 (file)
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -108,7 +108,6 @@ bool wxTimer::Start(int milliseconds,bool mode)
     wxCHECK_MSG( m_milli > 0, FALSE, wxT("invalid value for timer timeour") );
     wxCHECK_MSG( m_info->m_task.tmAddr == NULL , FALSE, wxT("attempting to restart a timer") );
 
-    m_milli = milliseconds;
 #if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
     m_info->m_task.tmAddr = NewTimerUPP( MacTimerProc ) ;
 #else
@@ -120,12 +119,11 @@ bool wxTimer::Start(int milliseconds,bool mode)
     m_info->m_timer = this ;
     InsXTime((QElemPtr) &m_info->m_task ) ;
     PrimeTime( (QElemPtr) &m_info->m_task , m_milli ) ;
-    return FALSE;
+    return TRUE;
 }
 
 void wxTimer::Stop()
 {
-    m_milli = 0 ;
     if ( m_info->m_task.tmAddr )
     {
         RmvTime(  (QElemPtr) &m_info->m_task ) ;