Commit 9fbd6841 authored by Paul Eggert's avatar Paul Eggert
Browse files

* msdos.c (mouse_get_pos): Likewise.

* w32inevt.c (movement_time, w32_console_mouse_position): Likewise.
parent 1a1f3366
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
Fixups, following up to the user-interface timestamp change. Fixups, following up to the user-interface timestamp change.
* nsterm.m (last_mouse_movement_time, ns_mouse_position): Use Time * nsterm.m (last_mouse_movement_time, ns_mouse_position): Use Time
for UI timestamps, instead of unsigned long. for UI timestamps, instead of unsigned long.
* msdos.c (mouse_get_pos): Likewise.
* w32inevt.c (movement_time, w32_console_mouse_position): Likewise.
* w32gui.h (Time): Define by including "systime.h" rather than by * w32gui.h (Time): Define by including "systime.h" rather than by
declaring it ourselves. (Bug#8664) declaring it ourselves. (Bug#8664)
......
...@@ -287,7 +287,7 @@ mouse_button_depressed (int b, int *xp, int *yp) ...@@ -287,7 +287,7 @@ mouse_button_depressed (int b, int *xp, int *yp)
void void
mouse_get_pos (FRAME_PTR *f, int insist, Lisp_Object *bar_window, mouse_get_pos (FRAME_PTR *f, int insist, Lisp_Object *bar_window,
enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y, enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y,
unsigned long *time) Time *time)
{ {
int ix, iy; int ix, iy;
Lisp_Object frame, tail; Lisp_Object frame, tail;
......
...@@ -45,7 +45,7 @@ extern HANDLE keyboard_handle; ...@@ -45,7 +45,7 @@ extern HANDLE keyboard_handle;
/* Info for last mouse motion */ /* Info for last mouse motion */
static COORD movement_pos; static COORD movement_pos;
static DWORD movement_time; static Time movement_time;
/* from w32fns.c */ /* from w32fns.c */
extern unsigned int map_keypad_keys (unsigned int, unsigned int); extern unsigned int map_keypad_keys (unsigned int, unsigned int);
...@@ -544,7 +544,7 @@ w32_console_mouse_position (FRAME_PTR *f, ...@@ -544,7 +544,7 @@ w32_console_mouse_position (FRAME_PTR *f,
enum scroll_bar_part *part, enum scroll_bar_part *part,
Lisp_Object *x, Lisp_Object *x,
Lisp_Object *y, Lisp_Object *y,
unsigned long *time) Time *time)
{ {
BLOCK_INPUT; BLOCK_INPUT;
...@@ -756,4 +756,3 @@ w32_console_read_socket (struct terminal *terminal, ...@@ -756,4 +756,3 @@ w32_console_read_socket (struct terminal *terminal,
UNBLOCK_INPUT; UNBLOCK_INPUT;
return ret; return ret;
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment