don't use deprecated wxMenuItem methods

[wxWidgets.git] / src / unix / timerunx.cpp

diff --git a/src/unix/timerunx.cpp b/src/unix/timerunx.cpp
index 12dc0bdf27407a5b9897ce24f5d78fed57d88bab..9c7468ea53c28e140dc09264ecb22c4953ac377e 100644 (file)
--- a/src/unix/timerunx.cpp
+++ b/src/unix/timerunx.cpp
@@ -18,6 +18,8 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+#if wxUSE_TIMER
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/module.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/module.h"


@@ -159,6 +161,11 @@ void wxTimerScheduler::NotifyExpired()
         wxUnixTimerImpl * const timer = s->m_timer;
         if ( timer->IsOneShot() )
         {
         wxUnixTimerImpl * const timer = s->m_timer;
         if ( timer->IsOneShot() )
         {

+            // the timer needs to be stopped but don't call its Stop() from
+            // here as it would attempt to remove the timer from our list and
+            // we had already done it, so we just need to reset its state
+            timer->MarkStopped();
+

             // don't need it any more
             delete s;
         }
             // don't need it any more
             delete s;
         }


@@ -249,3 +256,5 @@ wxUsecClock_t wxGetLocalTimeUsec()
     return wxGetLocalTimeMillis() * 1000L;
 }
 
     return wxGetLocalTimeMillis() * 1000L;
 }
 

+#endif // wxUSE_TIMER
+