X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee1025a7e0ae7a0ee95c7e13bf32d2a944065659..58c23da1d54bf50d9f892b692b941f2cd20d96d0:/src/msw/timer.cpp

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index 127f497d8e..e9904ba27c 100644
--- a/src/msw/timer.cpp
+++ b/src/msw/timer.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/timer.cpp
+// Name:        src/msw/timer.cpp
 // Purpose:     wxTimer implementation
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin (use hash map instead of list, global rewrite)
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "timer.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -22,9 +18,11 @@
 
 #if wxUSE_TIMER
 
+#include "wx/timer.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/window.h"
     #include "wx/list.h"
+    #include "wx/window.h"
     #include "wx/event.h"
     #include "wx/app.h"
     #include "wx/intl.h"
@@ -33,8 +31,6 @@
 
 #include "wx/hashmap.h"
 
-#include "wx/timer.h"
-
 #include "wx/msw/private.h"
 
 // ----------------------------------------------------------------------------
@@ -61,7 +57,7 @@ static wxTimerMap& TimerMap()
 // ----------------------------------------------------------------------------
 
 // timer callback used for all timers
-void WINAPI wxTimerProc(HWND hwnd, UINT msg, UINT idTimer, DWORD dwTime);
+void WINAPI wxTimerProc(HWND hwnd, UINT msg, UINT_PTR idTimer, DWORD dwTime);
 
 // ----------------------------------------------------------------------------
 // macros
@@ -155,7 +151,7 @@ void wxProcessTimer(wxTimer& timer)
 void WINAPI
 wxTimerProc(HWND WXUNUSED(hwnd),
             UINT WXUNUSED(msg),
-            UINT idTimer,
+            UINT_PTR idTimer,
             DWORD WXUNUSED(dwTime))
 {
     wxTimerMap::iterator node = TimerMap().find((unsigned long)idTimer);
@@ -166,4 +162,3 @@ wxTimerProc(HWND WXUNUSED(hwnd),
 }
 
 #endif // wxUSE_TIMER
-