mingw32 compilation fixes (unfortunately, this effectively disables placing controls...

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

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index d8cc8bd47283a5094e20b2a5d45123f08f742381..119e7a064291d095b0443ece955c80195dc325da 100644 (file)
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -54,7 +54,7 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
 // ----------------------------------------------------------------------------
 
 #ifdef __WIN32__
-    #define _EXPORT /**/
+    #define _EXPORT
 #else
     #define _EXPORT _export
 #endif
@@ -70,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();
 
@@ -86,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, T("invalid value for timer timeour") );
+    wxCHECK_MSG( milliseconds > 0, FALSE, wxT("invalid value for timer timeour") );
 
     lastMilli = milli = milliseconds;
 
@@ -114,19 +115,21 @@ 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
 // ----------------------------------------------------------------------------
+
 void wxProcessTimer(wxTimer& timer)
 {
     // Avoid to process spurious timer events
@@ -143,7 +146,7 @@ UINT WINAPI _EXPORT wxTimerProc(HWND WXUNUSED(hwnd), WORD, int idTimer, DWORD)
 {
     wxNode *node = wxTimerList.Find((long)idTimer);
 
-    wxCHECK_MSG( node, 0, T("bogus timer id in wxTimerProc") );
+    wxCHECK_MSG( node, 0, wxT("bogus timer id in wxTimerProc") );
 
     wxProcessTimer(*(wxTimer *)node->Data());