# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1084826686 0
# Node ID 773eb057811dd27c38856676700f16859058f688
# Parent  b5168ee835cbf5f5bc1f8644464fdfa8603dcd12
(w32_console_mouse_position, do_mouse_event, key_event): Don't mix
Lisp_Object and int.

diff -r b5168ee835cb -r 773eb057811d src/w32inevt.c
--- a/src/w32inevt.c	Mon May 17 20:09:39 2004 +0000
+++ b/src/w32inevt.c	Mon May 17 20:44:46 2004 +0000
@@ -464,12 +464,12 @@
 	}
       if (event->uChar.AsciiChar == 0)
 	return 0;
-      XSETINT (emacs_ev->code, event->uChar.AsciiChar);
+      emacs_ev->code = event->uChar.AsciiChar;
     }
   else
     {
       emacs_ev->kind = NON_ASCII_KEYSTROKE_EVENT;
-      XSETINT (emacs_ev->code, event->wVirtualKeyCode);
+      emacs_ev->code = event->wVirtualKeyCode;
     }
 
   XSETFRAME (emacs_ev->frame_or_window, get_frame ());
@@ -524,8 +524,8 @@
   *part = 0;
   SELECTED_FRAME ()->mouse_moved = 0;
 
-  *x = movement_pos.X;
-  *y = movement_pos.Y;
+  XSETINT(*x, movement_pos.X);
+  XSETINT(*y, movement_pos.Y);
   *time = movement_time;
 
   UNBLOCK_INPUT;
@@ -593,9 +593,9 @@
     if (but_change & mask)
       {
         if (i < NUM_TRANSLATED_MOUSE_BUTTONS)
-          XSETINT (emacs_ev->code, emacs_button_translation[i]);
+          emacs_ev->code = emacs_button_translation[i];
         else
-          XSETINT (emacs_ev->code, i);
+          emacs_ev->code = i;
 	break;
       }