Applied #15375 to stop event-sending in generic wxSpinCtrl ctor (eco)

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

diff --git a/src/common/timerimpl.cpp b/src/common/timerimpl.cpp
index 4ab6fa8e23950216290c6ae1075ba22be5064a21..d4d800d472ad38886075301baab11b8ab3fa14c8 100644 (file)
--- a/src/common/timerimpl.cpp
+++ b/src/common/timerimpl.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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)
 // Created:     04/01/98
 // Purpose:     wxTimerBase implementation
 // Author:      Julian Smart, Guillermo Rodriguez, Vadim Zeitlin
 // Modified by: VZ: extracted all non-wxTimer stuff in stopwatch.cpp (20.06.03)
 // Created:     04/01/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 //              (c) 1999 Guillermo Rodriguez <guille@iies.es>
 // Licence:     wxWindows licence
 // Copyright:   (c) Julian Smart
 //              (c) 1999 Guillermo Rodriguez <guille@iies.es>
 // Licence:     wxWindows licence


@@ -49,7 +48,7 @@ void wxTimerImpl::SetOwner(wxEvtHandler *owner, int timerid)
 void wxTimerImpl::SendEvent()
 {
     wxTimerEvent event(*m_timer);
 void wxTimerImpl::SendEvent()
 {
     wxTimerEvent event(*m_timer);

-    (void)m_owner->ProcessEvent(event);
+    (void)m_owner->SafelyProcessEvent(event);

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


@@ -58,7 +57,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() )