From c8061385a94d869bee968b4137514e394fde3504 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Thu, 24 Jul 2008 12:55:53 +0000 Subject: [PATCH] =?utf8?q?Bug=20544510=20=E2=80=93=20SetTimer=20callback?= =?utf8?q?=20signatures=20has=20the=20wrong=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-07-24 Cody Russell 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. svn path=/trunk/; revision=20903 --- ChangeLog | 8 ++++++++ gdk/win32/gdkevents-win32.c | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5bc21334..a3dd598eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-07-24 Cody Russell + + 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. + 2008-07-23 Matthias Clasen Bug 543915 – "Sole completion" translation issue diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 6e3565469..d98f1662e 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -2033,7 +2033,7 @@ handle_stuff_while_moving_or_resizing (void) 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 @@ modal_timer_proc (HWND hwnd, } 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)) -- 2.43.2