summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-03-03 22:47:53 +0000
committerRichard M. Stallman <rms@gnu.org>1996-03-03 22:47:53 +0000
commit2a2a49ef6d6b37fdf7bdcf0a6d154e972601701e (patch)
tree48038ef8d71c6f59972ff0d34f38e5b3b6413db5
parent65ee1c0b27fd87d2752f6c516804b00b71594070 (diff)
downloademacs-2a2a49ef6d6b37fdf7bdcf0a6d154e972601701e.tar.gz
Put most of file into HAVE_MENUS conditional.
(Fx_popup_menu): Put parts into HAVE_MENUS conditionals.
-rw-r--r--src/xmenu.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 7a63229e152..9e85afdfcda 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -771,6 +771,7 @@ cached information about equivalent key sequences.")
int for_click = 0;
struct gcpro gcpro1;
+#ifdef HAVE_MENUS
if (! NILP (position))
{
check_x ();
@@ -844,6 +845,7 @@ cached information about equivalent key sequences.")
xpos += XINT (x);
ypos += XINT (y);
}
+#endif /* HAVE_MENUS */
title = Qnil;
GCPRO1 (title);
@@ -923,6 +925,7 @@ cached information about equivalent key sequences.")
return Qnil;
}
+#ifdef HAVE_MENUS
/* Display them in a menu. */
BLOCK_INPUT;
@@ -933,11 +936,14 @@ cached information about equivalent key sequences.")
discard_menu_items ();
UNGCPRO;
+#endif /* HAVE_MENUS */
if (error_name) error (error_name);
return selection;
}
+#ifdef HAVE_MENUS
+
DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 2, 0,
"Pop up a dialog box and return user's selection.\n\
POSITION specifies which frame to use.\n\
@@ -2631,6 +2637,8 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
}
#endif /* not USE_X_TOOLKIT */
+
+#endif /* HAVE_MENUS */
syms_of_xmenu ()
{
@@ -2646,5 +2654,7 @@ syms_of_xmenu ()
#endif
defsubr (&Sx_popup_menu);
+#ifdef HAVE_MENUS
defsubr (&Sx_popup_dialog);
+#endif
}