X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c085e333984dc079a001cd3f581aeb1f51a1f227..2ee3ee1bc8ac2f95029835ebc115fac0a1fbd02a:/src/msw/timer.cpp

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 844e0b1f56..119e7a0642 100644
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -6,17 +6,9 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// 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
 
@@ -59,7 +54,7 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
 // ----------------------------------------------------------------------------
 
 #ifdef __WIN32__
-    #define _EXPORT /**/
+    #define _EXPORT
 #else
     #define _EXPORT _export
 #endif
@@ -75,14 +70,15 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
 // ----------------------------------------------------------------------------
 // wxTimer class
 // ----------------------------------------------------------------------------
-wxTimer::wxTimer(void)
+
+wxTimer::wxTimer()
 {
-    milli = 0 ;
-    lastMilli = -1 ;
+    milli = 0;
+    lastMilli = -1;
     id = 0;
 }
 
-wxTimer::~wxTimer(void)
+wxTimer::~wxTimer()
 {
     Stop();
 
@@ -91,11 +87,11 @@ wxTimer::~wxTimer(void)
 
 bool wxTimer::Start(int milliseconds, bool mode)
 {
-    oneShot = mode ;
+    oneShot = mode;
     if (milliseconds < 0)
         milliseconds = lastMilli;
 
-    wxCHECK_MSG( milliseconds > 0, FALSE, "invalid value for timer timeour" );
+    wxCHECK_MSG( milliseconds > 0, FALSE, wxT("invalid value for timer timeour") );
 
     lastMilli = milli = milliseconds;
 
@@ -119,20 +115,22 @@ bool wxTimer::Start(int milliseconds, bool mode)
     }
 }
 
-void wxTimer::Stop(void)
+void wxTimer::Stop()
 {
-    if (id) {
+    if ( id )
+    {
         KillTimer(NULL, (UINT)id);
-        wxTimerList.DeleteObject(this); /* @@@@ */
+        wxTimerList.DeleteObject(this);
     }
-    id = 0 ;
-    milli = 0 ;
+    id = 0;
+    milli = 0;
 }
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
-static void wxProcessTimer(wxTimer& timer)
+
+void wxProcessTimer(wxTimer& timer)
 {
     // Avoid to process spurious timer events
     if ( timer.id == 0)
@@ -148,7 +146,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, wxT("bogus timer id in wxTimerProc") );
 
     wxProcessTimer(*(wxTimer *)node->Data());