gtk+ r20903 - in trunk: . gdk/win32

[bratsche svn gnome org]

Author: bratsche
Date: Thu Jul 24 12:55:53 2008
New Revision: 20903
URL: http://svn.gnome.org/viewvc/gtk+?rev=20903&view=rev

Log:
2008-07-24  Cody Russell  <bratsche gnome org>

        Bug 544510 â SetTimer callback signatures has the wrong type

        * gdk/win32/gdkevents-win32.c: Fix modal_timer_proc() and
        sync_timer_proc() to use UINT_PTR for the 'id' parameter
        instead of 'id'.  Patch by Richard Hult.



Modified:
   trunk/ChangeLog
   trunk/gdk/win32/gdkevents-win32.c

Modified: trunk/gdk/win32/gdkevents-win32.c
==============================================================================
--- trunk/gdk/win32/gdkevents-win32.c	(original)
+++ trunk/gdk/win32/gdkevents-win32.c	Thu Jul 24 12:55:53 2008
@@ -2033,7 +2033,7 @@
 static VOID CALLBACK
 modal_timer_proc (HWND     hwnd,
 		  UINT     msg,
-		  UINT     id,
+		  UINT_PTR id,
 		  DWORD    time)
 {
   if (_sizemove_in_progress)
@@ -2041,10 +2041,10 @@
 }
 
 static VOID CALLBACK
-sync_timer_proc (HWND hwnd,
-		 UINT msg,
-		 UINT id,
-		 DWORD time)
+sync_timer_proc (HWND     hwnd,
+		 UINT     msg,
+		 UINT_PTR id,
+		 DWORD    time)
 {
   MSG message;
   if (PeekMessageW (&message, hwnd, WM_PAINT, WM_PAINT, PM_REMOVE))