1. minor fixes in wxDynLib

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

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 7a12dc3c2d308225e7ba6ab35ea4937ea1dad990..6189c291602ff92ad86b83ec1b271e3828a65e8c 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -20,9 +20,13 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/window.h"
+#include "wx/msw/private.h"
+

 #ifndef WX_PRECOMP
     #include "wx/setup.h"
     #include "wx/list.h"
 #ifndef WX_PRECOMP
     #include "wx/setup.h"
     #include "wx/list.h"

+    #include "wx/event.h"

     #include "wx/app.h"
 #endif
 
     #include "wx/app.h"
 #endif
 


@@ -30,12 +34,11 @@
 #include "wx/log.h"
 
 #include "wx/timer.h"
 #include "wx/log.h"
 
 #include "wx/timer.h"

-#include "wx/msw/private.h"

 
 #include <time.h>
 #include <sys/types.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
 
     #include <sys/timeb.h>
 #endif
 


@@ -87,7 +90,7 @@ bool wxTimer::Start(int milliseconds, bool mode)
     if (milliseconds < 0)
         milliseconds = lastMilli;
 
     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;
 
 
     lastMilli = milli = milliseconds;
 


@@ -140,7 +143,7 @@ UINT WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
 {
     wxNode *node = wxTimerList.Find((long)idTimer);
 
 {
     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());
 
 
     wxProcessTimer(*(wxTimer *)node->Data());