made GetColourFromGTKWidget() more general, it is now used for all colours

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

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index a958d21f1ff37849bad8cc01d9670073d372a8fc..f2b5f2e8961ec113b98baac62f9bd738d3713359 100644 (file)
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -72,13 +72,15 @@ bool wxTimer::Start(int milliseconds,bool mode)
     wxCHECK_MSG( m_info.m_task.tmAddr == NULL , FALSE, wxT("attempting to restart a timer") );
 
     m_milli = milliseconds;
-#ifdef __UNIX__
+#if defined(UNIVERSAL_INTERFACES_VERSION) && (UNIVERSAL_INTERFACES_VERSION >= 0x0340)
     m_info.m_task.tmAddr = NewTimerUPP( MacTimerProc ) ;
 #else
     m_info.m_task.tmAddr = NewTimerProc( MacTimerProc ) ;
 #endif
     m_info.m_task.tmWakeUp = 0 ;
     m_info.m_task.tmReserved = 0 ;
+       m_info.m_task.qType = 0 ;
+       m_info.m_timer = this ;
     InsXTime((QElemPtr) &m_info.m_task ) ;
     PrimeTime( (QElemPtr) &m_info.m_task , m_milli ) ;
     return FALSE;