aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1994-10-04 19:47:37 +0000
committerKarl Heuer1994-10-04 19:47:37 +0000
commita39f04772bd0235d7dcc4c131f24e4202b86e2e2 (patch)
tree54f7d87e8c1945bd29b0b5128c9bf1956f20b89e /src
parente0c1aef22bc59c2c7871846d1231b68fe4abb6c3 (diff)
downloademacs-a39f04772bd0235d7dcc4c131f24e4202b86e2e2.tar.gz
emacs-a39f04772bd0235d7dcc4c131f24e4202b86e2e2.zip
(Fx_popup_menu, Fx_popup_dialog): Use new accessor macros instead of calling
XSET directly.
Diffstat (limited to 'src')
-rw-r--r--src/xmenu.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 42b2e118c3c..4a06c2c1b8d 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -727,7 +727,7 @@ cached information about equivalent key sequences.")
727 if (mouse_position_hook) 727 if (mouse_position_hook)
728 (*mouse_position_hook) (&new_f, &bar_window, &part, &x, &y, &time); 728 (*mouse_position_hook) (&new_f, &bar_window, &part, &x, &y, &time);
729 if (new_f != 0) 729 if (new_f != 0)
730 XSET (window, Lisp_Frame, new_f); 730 XSETFRAME (window, new_f);
731 else 731 else
732 { 732 {
733 window = selected_window; 733 window = selected_window;
@@ -918,7 +918,7 @@ on the left of the dialog box and all following items on the right.\n\
918 (*mouse_position_hook) (&new_f, &bar_window, &part, &x, &y, &time); 918 (*mouse_position_hook) (&new_f, &bar_window, &part, &x, &y, &time);
919 919
920 if (new_f != 0) 920 if (new_f != 0)
921 XSET (window, Lisp_Frame, new_f); 921 XSETFRAME (window, new_f);
922 else 922 else
923 window = selected_window; 923 window = selected_window;
924#endif 924#endif
@@ -960,9 +960,9 @@ on the left of the dialog box and all following items on the right.\n\
960 in the middle of frame F. */ 960 in the middle of frame F. */
961 { 961 {
962 Lisp_Object x, y, frame, newpos; 962 Lisp_Object x, y, frame, newpos;
963 XSET (frame, Lisp_Frame, f); 963 XSETFRAME (frame, f);
964 XSET (x, Lisp_Int, x_pixel_width (f) / 2); 964 XSETINT (x, x_pixel_width (f) / 2);
965 XSET (y, Lisp_Int, x_pixel_height (f) / 2); 965 XSETINT (y, x_pixel_height (f) / 2);
966 newpos = Fcons (Fcons (x, Fcons (y, Qnil)), Fcons (frame, Qnil)); 966 newpos = Fcons (Fcons (x, Fcons (y, Qnil)), Fcons (frame, Qnil));
967 967
968 return Fx_popup_menu (newpos, 968 return Fx_popup_menu (newpos,