use one shot timers in wxAnimationCtrl (patch 1774535)

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

diff --git a/docs/changes.txt b/docs/changes.txt
index b41e293e4f70aae089b3f626b04f4a930adc764e..91189d5e8524b5914aab36b0f6250f59a835d8ae 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -215,6 +215,7 @@ wxMSW:
 - Fixed bug with symbol resolving in wxStackWalker (Axel Gembe)
 - Fixed showing busy cursor for disabled windows and during wxExecute()
 - Set the string of wxEVT_COMMAND_CHECKLISTBOX_TOGGLED events (Luca Cappa)
 - Fixed bug with symbol resolving in wxStackWalker (Axel Gembe)
 - Fixed showing busy cursor for disabled windows and during wxExecute()
 - Set the string of wxEVT_COMMAND_CHECKLISTBOX_TOGGLED events (Luca Cappa)

+- Fix problems with timers on SMP machines in wxAnimationCtrl (Gennady)

 
 wxGTK:
 
 
 wxGTK:
 

diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp
index d860f2d487f03f290a2a6bcab89285488bbe7eed..dc7062fc07eb9393efc66d23a2ddba54e7423041 100644 (file)
--- a/src/generic/animateg.cpp
+++ b/src/generic/animateg.cpp
@@ -418,7 +418,7 @@ bool wxAnimationCtrl::Play(bool looped)
     int delay = m_animation.GetDelay(0);
     if (delay == 0)
         delay = 1;      // 0 is invalid timeout for wxTimer.
     int delay = m_animation.GetDelay(0);
     if (delay == 0)
         delay = 1;      // 0 is invalid timeout for wxTimer.

-    m_timer.Start(delay);
+    m_timer.Start(delay, true);

 
     return true;
 }
 
     return true;
 }


@@ -663,7 +663,7 @@ void wxAnimationCtrl::OnTimer(wxTimerEvent &WXUNUSED(event))
     int delay = m_animation.GetDelay(m_currentFrame);
     if (delay == 0)
         delay = 1;      // 0 is invalid timeout for wxTimer.
     int delay = m_animation.GetDelay(m_currentFrame);
     if (delay == 0)
         delay = 1;      // 0 is invalid timeout for wxTimer.

-    m_timer.Start(delay);
+    m_timer.Start(delay, true);

 }
 
 void wxAnimationCtrl::OnSize(wxSizeEvent &WXUNUSED(event))
 }
 
 void wxAnimationCtrl::OnSize(wxSizeEvent &WXUNUSED(event))