wxControl and wxChoice derive from the base classes under wxGTK too now

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

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 334fe2c99b488463d58e1308d64c1d00e3b6098f..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
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -54,7 +54,7 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
 // ----------------------------------------------------------------------------
 
 #ifdef __WIN32__
 // ----------------------------------------------------------------------------
 
 #ifdef __WIN32__

-    #define _EXPORT /**/
+    #define _EXPORT

 #else
     #define _EXPORT _export
 #endif
 #else
     #define _EXPORT _export
 #endif


@@ -70,14 +70,15 @@ UINT WINAPI _EXPORT wxTimerProc(HWND hwnd, WORD, int idTimer, DWORD);
 // ----------------------------------------------------------------------------
 // wxTimer class
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTimer class
 // ----------------------------------------------------------------------------

-wxTimer::wxTimer(void)
+
+wxTimer::wxTimer()

 {
 {

-    milli = 0 ;
-    lastMilli = -1 ;
+    milli = 0;
+    lastMilli = -1;

     id = 0;
 }
 
     id = 0;
 }
 

-wxTimer::~wxTimer(void)
+wxTimer::~wxTimer()

 {
     Stop();
 
 {
     Stop();
 


@@ -86,11 +87,11 @@ wxTimer::~wxTimer(void)
 
 bool wxTimer::Start(int milliseconds, bool mode)
 {
 
 bool wxTimer::Start(int milliseconds, bool mode)
 {

-    oneShot = mode ;
+    oneShot = 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, wxT("invalid value for timer timeour") );

 
     lastMilli = milli = milliseconds;
 
 
     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);
         KillTimer(NULL, (UINT)id);

-        wxTimerList.DeleteObject(this); /* @@@@ */
+        wxTimerList.DeleteObject(this);

     }
     }

-    id = 0 ;
-    milli = 0 ;
+    id = 0;
+    milli = 0;

 }
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------

+

 void wxProcessTimer(wxTimer& timer)
 {
     // Avoid to process spurious timer events
 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);
 
 {
     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());
 
 
     wxProcessTimer(*(wxTimer *)node->Data());