MingW32 compilation works now.

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

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 844e0b1f56f787dd6658bd8354ec4a9682ede794..6189c291602ff92ad86b83ec1b271e3828a65e8c 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -9,14 +9,6 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
 #ifdef __GNUG__
     #pragma implementation "timer.h"
 #endif
@@ -28,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
 
@@ -38,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
 
@@ -95,7 +90,7 @@ bool wxTimer::Start(int milliseconds, bool mode)
     if (milliseconds < 0)
         milliseconds = lastMilli;
 
-    wxCHECK_MSG( milliseconds > 0, FALSE, "invalid value for timer timeour" );
+    wxCHECK_MSG( milliseconds > 0, FALSE, _T("invalid value for timer timeour") );
 
     lastMilli = milli = milliseconds;
 
@@ -132,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)
@@ -148,7 +143,7 @@ UINT WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
 {
     wxNode *node = wxTimerList.Find((long)idTimer);
 
-    wxCHECK_MSG( node, 0, "bogus timer id in wxTimerProc" );
+    wxCHECK_MSG( node, 0, _T("bogus timer id in wxTimerProc") );
 
     wxProcessTimer(*(wxTimer *)node->Data());