summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2006-11-12 17:52:29 +0000
committerChong Yidong <cyd@stupidchicken.com>2006-11-12 17:52:29 +0000
commitb79b8a1c520eec3863903a17ac294a556ea7730f (patch)
treeb95fed185ba21547cd25f37e482aed3d86575e06
parentb071677f0e76c59fe188b210db7723a8d51c7477 (diff)
downloademacs-b79b8a1c520eec3863903a17ac294a556ea7730f.tar.gz
(popup_activated): Define outside HAVE_MENUS.
-rw-r--r--src/xmenu.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/xmenu.c b/src/xmenu.c
index 24be4fd5cb7..037422abde1 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1488,14 +1488,6 @@ x_activate_menubar (f)
f->output_data.x->saved_menu_event->type = 0;
}
-/* Detect if a dialog or menu has been posted. */
-
-int
-popup_activated ()
-{
- return popup_activated_flag;
-}
-
/* This callback is invoked when the user selects a menubar cascade
pushbutton, but before the pulldown menu is posted. */
@@ -3762,6 +3754,13 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
#endif /* HAVE_MENUS */
+/* Detect if a dialog or menu has been posted. */
+
+int
+popup_activated ()
+{
+ return popup_activated_flag;
+}
/* The following is used by delayed window autoselection. */