[ 1509599 ] 'Split pickers page in widgets sample' with more icons and rebaking.

[wxWidgets.git] / src / generic / timer.cpp

diff --git a/src/generic/timer.cpp b/src/generic/timer.cpp
index 63fe3a3e9fdb3203f48239c6a2703398212fdae0..92b513ef35f2823e79653c926647c6b2a39540ba 100644 (file)
--- a/src/generic/timer.cpp
+++ b/src/generic/timer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mgl/timer.cpp
+// Name:        src/generic/timer.cpp

 // Purpose:     wxTimer implementation
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:     wxTimer implementation
 // Author:      Vaclav Slavik
 // Id:          $Id$


@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "timer.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -24,11 +20,14 @@
 //     is in wxEventLoop::Dispatch().
 // ----------------------------------------------------------------------------
 
 //     is in wxEventLoop::Dispatch().
 // ----------------------------------------------------------------------------
 

+#if wxUSE_TIMER
+

 #include "wx/timer.h"
 
 #include "wx/timer.h"
 

-#if wxUSE_TIMER
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+#endif

 
 

-#include "wx/log.h"

 #include "wx/module.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/module.h"
 
 // ----------------------------------------------------------------------------


@@ -194,7 +193,11 @@ void wxTimerScheduler::NotifyTimers()
                         QueueTimer(desc, now + desc->timer->GetInterval());
                 }
                 else
                         QueueTimer(desc, now + desc->timer->GetInterval());
                 }
                 else

+                {

                     desc = m_timers;
                     desc = m_timers;

+                    if (!desc)
+                        break;
+                }

             }
         }
     }
             }
         }
     }