adding OnLaunched

[wxWidgets.git] / src / common / timerimpl.cpp

diff --git a/src/common/timerimpl.cpp b/src/common/timerimpl.cpp
index d952af816f79d9d2d44e46745f4cacc33b7bc140..8c89ad68d9ba6c6295f3eb33107b5e1045f9eb69 100644 (file)
--- a/src/common/timerimpl.cpp
+++ b/src/common/timerimpl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/timercmn.cpp
+// Name:        src/common/timerimpl.cpp

 // Purpose:     wxTimerBase implementation
 // Author:      Julian Smart, Guillermo Rodriguez, Vadim Zeitlin
 // Modified by: VZ: extracted all non-wxTimer stuff in stopwatch.cpp (20.06.03)
 // Purpose:     wxTimerBase implementation
 // Author:      Julian Smart, Guillermo Rodriguez, Vadim Zeitlin
 // Modified by: VZ: extracted all non-wxTimer stuff in stopwatch.cpp (20.06.03)


@@ -29,6 +29,7 @@
 
 #include "wx/private/timer.h"
 #include "wx/utils.h"               // for wxNewId()
 
 #include "wx/private/timer.h"
 #include "wx/utils.h"               // for wxNewId()

+#include "wx/thread.h"

 
 wxTimerImpl::wxTimerImpl(wxTimer *timer)
 {
 
 wxTimerImpl::wxTimerImpl(wxTimer *timer)
 {


@@ -47,9 +48,8 @@ void wxTimerImpl::SetOwner(wxEvtHandler *owner, int timerid)
 
 void wxTimerImpl::SendEvent()
 {
 
 void wxTimerImpl::SendEvent()
 {

-    wxTimerEvent event(m_idTimer, m_milli);
-    event.SetEventObject(m_owner);
-    (void)m_owner->ProcessEvent(event);
+    wxTimerEvent event(*m_timer);
+    (void)m_owner->SafelyProcessEvent(event);

 }
 
 bool wxTimerImpl::Start(int milliseconds, bool oneShot)
 }
 
 bool wxTimerImpl::Start(int milliseconds, bool oneShot)


@@ -58,7 +58,7 @@ bool wxTimerImpl::Start(int milliseconds, bool oneShot)
     // let the caller know about it
 #if wxUSE_THREADS
     wxASSERT_MSG( wxThread::IsMain(),
     // let the caller know about it
 #if wxUSE_THREADS
     wxASSERT_MSG( wxThread::IsMain(),

-                  _T("timer can only be started from the main thread") );
+                  wxT("timer can only be started from the main thread") );

 #endif // wxUSE_THREADS
 
     if ( IsRunning() )
 #endif // wxUSE_THREADS
 
     if ( IsRunning() )