wxWindow::Fit() infinite loop bug fixed

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

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 5a6e1cf939697f3d726d7efb90b8e0fff654fa50..334fe2c99b488463d58e1308d64c1d00e3b6098f 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -20,9 +20,13 @@
     #pragma hdrstop
 #endif
 
+#include "wx/window.h"
+#include "wx/msw/private.h"
+
 #ifndef WX_PRECOMP
     #include "wx/setup.h"
     #include "wx/list.h"
+    #include "wx/event.h"
     #include "wx/app.h"
 #endif
 
@@ -30,12 +34,11 @@
 #include "wx/log.h"
 
 #include "wx/timer.h"
-#include "wx/msw/private.h"
 
 #include <time.h>
 #include <sys/types.h>
 
-#if !defined(__SC__) && !defined(__GNUWIN32__)
+#if !defined(__SC__) && !defined(__GNUWIN32__) && !defined(__MWERKS__)
     #include <sys/timeb.h>
 #endif
 
@@ -124,7 +127,7 @@ void wxTimer::Stop(void)
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
-static void wxProcessTimer(wxTimer& timer)
+void wxProcessTimer(wxTimer& timer)
 {
     // Avoid to process spurious timer events
     if ( timer.id == 0)