no message

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/timer.cpp b/src/mac/carbon/timer.cpp
index 107906e76390397021ded29b072e42561e845348..f2b5f2e8961ec113b98baac62f9bd738d3713359 100644 (file)
--- a/src/mac/carbon/timer.cpp
+++ b/src/mac/carbon/timer.cpp
@@ -79,6 +79,8 @@ bool wxTimer::Start(int milliseconds,bool mode)
 #endif
     m_info.m_task.tmWakeUp = 0 ;
     m_info.m_task.tmReserved = 0 ;
 #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;
     InsXTime((QElemPtr) &m_info.m_task ) ;
     PrimeTime( (QElemPtr) &m_info.m_task , m_milli ) ;
     return FALSE;

diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp
index 9389888343bae3610ae8864ccdacd6ea0b0b672b..1a71c0c7840173ec28e56c6a1a8418bc9fada85f 100644 (file)
--- a/src/mac/carbon/utils.cpp
+++ b/src/mac/carbon/utils.cpp
@@ -104,7 +104,7 @@ bool wxGetUserName(char *buf, int maxSize)
   return TRUE;
 }
 
   return TRUE;
 }
 

-int wxKill(long pid, int sig)
+int wxKill(long pid, wxSignal sig)

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;

diff --git a/src/mac/timer.cpp b/src/mac/timer.cpp
index 107906e76390397021ded29b072e42561e845348..f2b5f2e8961ec113b98baac62f9bd738d3713359 100644 (file)
--- a/src/mac/timer.cpp
+++ b/src/mac/timer.cpp
@@ -79,6 +79,8 @@ bool wxTimer::Start(int milliseconds,bool mode)
 #endif
     m_info.m_task.tmWakeUp = 0 ;
     m_info.m_task.tmReserved = 0 ;
 #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;
     InsXTime((QElemPtr) &m_info.m_task ) ;
     PrimeTime( (QElemPtr) &m_info.m_task , m_milli ) ;
     return FALSE;

diff --git a/src/mac/utils.cpp b/src/mac/utils.cpp
index 9389888343bae3610ae8864ccdacd6ea0b0b672b..1a71c0c7840173ec28e56c6a1a8418bc9fada85f 100644 (file)
--- a/src/mac/utils.cpp
+++ b/src/mac/utils.cpp
@@ -104,7 +104,7 @@ bool wxGetUserName(char *buf, int maxSize)
   return TRUE;
 }
 
   return TRUE;
 }
 

-int wxKill(long pid, int sig)
+int wxKill(long pid, wxSignal sig)

 {
     // TODO
     return 0;
 {
     // TODO
     return 0;