aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2006-11-12 17:52:29 +0000
committerChong Yidong2006-11-12 17:52:29 +0000
commitb79b8a1c520eec3863903a17ac294a556ea7730f (patch)
treeb95fed185ba21547cd25f37e482aed3d86575e06 /src
parentb071677f0e76c59fe188b210db7723a8d51c7477 (diff)
downloademacs-b79b8a1c520eec3863903a17ac294a556ea7730f.tar.gz
emacs-b79b8a1c520eec3863903a17ac294a556ea7730f.zip
(popup_activated): Define outside HAVE_MENUS.
Diffstat (limited to 'src')
-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)
1488 f->output_data.x->saved_menu_event->type = 0; 1488 f->output_data.x->saved_menu_event->type = 0;
1489} 1489}
1490 1490
1491/* Detect if a dialog or menu has been posted. */
1492
1493int
1494popup_activated ()
1495{
1496 return popup_activated_flag;
1497}
1498
1499/* This callback is invoked when the user selects a menubar cascade 1491/* This callback is invoked when the user selects a menubar cascade
1500 pushbutton, but before the pulldown menu is posted. */ 1492 pushbutton, but before the pulldown menu is posted. */
1501 1493
@@ -3762,6 +3754,13 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
3762 3754
3763#endif /* HAVE_MENUS */ 3755#endif /* HAVE_MENUS */
3764 3756
3757/* Detect if a dialog or menu has been posted. */
3758
3759int
3760popup_activated ()
3761{
3762 return popup_activated_flag;
3763}
3765 3764
3766/* The following is used by delayed window autoselection. */ 3765/* The following is used by delayed window autoselection. */
3767 3766