diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-14 02:03:53 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-05-14 02:03:53 -0700 |
| commit | 1a1f33668536488bb146bbd83cd0df741c4d9cdc (patch) | |
| tree | f1f561596baac11716afa2b5b82c2245b91b05c8 /src/nsterm.m | |
| parent | 66699ad31291ec329760966945ec4d4ad4688586 (diff) | |
| download | emacs-1a1f33668536488bb146bbd83cd0df741c4d9cdc.tar.gz | |
Fixups, following up to the user-interface timestamp change.
* nsterm.m (last_mouse_movement_time, ns_mouse_position): Use Time
for UI timestamps, instead of unsigned long.
* w32gui.h (Time): Define by including "systime.h" rather than by
declaring it ourselves. (Bug#8664)
Diffstat (limited to 'src/nsterm.m')
| -rw-r--r-- | src/nsterm.m | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index c4756dc83cd..ac9c44a57a9 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -158,7 +158,7 @@ long context_menu_value = 0; /* display update */ NSPoint last_mouse_motion_position; static NSRect last_mouse_glyph; -static unsigned long last_mouse_movement_time = 0; +static Time last_mouse_movement_time = 0; static Lisp_Object last_mouse_motion_frame; static EmacsScroller *last_mouse_scroll_bar = nil; static struct frame *ns_updating_frame; @@ -1789,7 +1789,7 @@ note_mouse_movement (struct frame *frame, float x, float y) static void ns_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window, enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y, - unsigned long *time) + Time *time) /* -------------------------------------------------------------------------- External (hook): inform emacs about mouse position and hit parts. If a scrollbar is being dragged, set bar_window, part, x, y, time. @@ -6531,5 +6531,3 @@ baseline level. The default value is nil. */); /* Tell emacs about this window system. */ Fprovide (intern ("ns"), Qnil); } - - |