# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 781300057 0
# Node ID 8a59acc95eea9cd11c7470d5599e5c0e341b4bcb
# Parent  873508897cc21bf618aea61dc654cecb6ca6ae89
(Fx_popup_menu, Fx_popup_dialog): Use new accessor macros instead of calling
XSET directly.

diff -r 873508897cc2 -r 8a59acc95eea src/xmenu.c
--- a/src/xmenu.c	Tue Oct 04 19:46:12 1994 +0000
+++ b/src/xmenu.c	Tue Oct 04 19:47:37 1994 +0000
@@ -727,7 +727,7 @@
 	  if (mouse_position_hook)
 	    (*mouse_position_hook) (&new_f, &bar_window, &part, &x, &y, &time);
 	  if (new_f != 0)
-	    XSET (window, Lisp_Frame, new_f);
+	    XSETFRAME (window, new_f);
 	  else
 	    {
 	      window = selected_window;
@@ -918,7 +918,7 @@
       (*mouse_position_hook) (&new_f, &bar_window, &part, &x, &y, &time);
 
       if (new_f != 0)
-	XSET (window, Lisp_Frame, new_f);
+	XSETFRAME (window, new_f);
       else
 	window = selected_window;
 #endif
@@ -960,9 +960,9 @@
      in the middle of frame F.  */
   {
     Lisp_Object x, y, frame, newpos;
-    XSET (frame, Lisp_Frame, f);
-    XSET (x, Lisp_Int, x_pixel_width (f) / 2);
-    XSET (y, Lisp_Int, x_pixel_height (f) / 2);
+    XSETFRAME (frame, f);
+    XSETINT (x, x_pixel_width (f) / 2);
+    XSETINT (y, x_pixel_height (f) / 2);
     newpos = Fcons (Fcons (x, Fcons (y, Qnil)), Fcons (frame, Qnil));
 
     return Fx_popup_menu (newpos,