# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 785136153 0
# Node ID 10fc4417831d2d9e4a58733f33cb2e20a6dd4f71
# Parent  402c87cbc4fac8817c11e82b0a8ea75ceb2a2999
(SET_FRAME, key_event, do_mouse_event): Use accessor macros.

diff -r 402c87cbc4fa -r 10fc4417831d src/w32inevt.c
--- a/src/w32inevt.c	Fri Nov 18 04:49:51 1994 +0000
+++ b/src/w32inevt.c	Fri Nov 18 05:22:33 1994 +0000
@@ -93,7 +93,7 @@
 }
 
 #ifdef MULTI_FRAME
-#define SET_FRAME(o, f) XSET (o, Lisp_Frame, f)
+#define SET_FRAME(o, f) XSETFRAME (o, f)
 #else
 #define SET_FRAME(o, f) ((o) = Qnil)
 #endif
@@ -258,7 +258,7 @@
     {
       /* ASCII */
       emacs_ev->kind = ascii_keystroke;
-      XSET (emacs_ev->code, Lisp_Int, event->uChar.AsciiChar);
+      XSETINT (emacs_ev->code, event->uChar.AsciiChar);
     }
   else
     {
@@ -269,7 +269,7 @@
        * the full X keysym values (2nd byte is 0xff).  add it on.
        */
       map |= 0xff00;
-      XSET (emacs_ev->code, Lisp_Int, map);
+      XSETINT (emacs_ev->code, map);
     }
   SET_FRAME (emacs_ev->frame_or_window, get_frame ());
   emacs_ev->modifiers = nt_kbd_mods_to_emacs (event->dwControlKeyState);
@@ -360,7 +360,7 @@
   for (i = 0; i < NUM_MOUSE_BUTTONS; i++, mask <<= 1)
     if (but_change & mask)
       {
-	XSET (emacs_ev->code, Lisp_Int, emacs_button_translation[i]);
+	XSETINT (emacs_ev->code, emacs_button_translation[i]);
 	break;
       }
 
@@ -374,8 +374,8 @@
   emacs_ev->modifiers = nt_kbd_mods_to_emacs (event->dwControlKeyState) |
     ((event->dwButtonState & mask) ? down_modifier : up_modifier);
   
-  XFASTINT (emacs_ev->x) = event->dwMousePosition.X;
-  XFASTINT (emacs_ev->y) = event->dwMousePosition.Y;
+  XSETFASTINT (emacs_ev->x, event->dwMousePosition.X);
+  XSETFASTINT (emacs_ev->y, event->dwMousePosition.Y);
   SET_FRAME (emacs_ev->frame_or_window, get_frame ());
   
   return 1;