diff options
| author | Dave Love | 2000-10-05 21:18:30 +0000 |
|---|---|---|
| committer | Dave Love | 2000-10-05 21:18:30 +0000 |
| commit | 2b06561ab5054b2b36b74dfcf1c3bf38bc1090ff (patch) | |
| tree | 5a1be08a805b8c5b1f6458cee7816c0f65bd71cc /src/xmenu.c | |
| parent | 1391c567676eef53f0a457c1a105860f67379678 (diff) | |
| download | emacs-2b06561ab5054b2b36b74dfcf1c3bf38bc1090ff.tar.gz emacs-2b06561ab5054b2b36b74dfcf1c3bf38bc1090ff.zip | |
(Fx_popup_menu, Fx_popup_dialog): Check for tool-bar
position like menu-bar.
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index fa7c352cc88..db20b6b0b61 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* X Communication module for terminals which understand the X protocol. | 1 | /* X Communication module for terminals which understand the X protocol. |
| 2 | Copyright (C) 1986, 88, 93, 94, 96, 1999 Free Software Foundation, Inc. | 2 | Copyright (C) 1986, 88, 93, 94, 96, 99, 2000 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -708,7 +708,8 @@ cached information about equivalent key sequences.") | |||
| 708 | 708 | ||
| 709 | /* Decode the first argument: find the window and the coordinates. */ | 709 | /* Decode the first argument: find the window and the coordinates. */ |
| 710 | if (EQ (position, Qt) | 710 | if (EQ (position, Qt) |
| 711 | || (CONSP (position) && EQ (XCAR (position), Qmenu_bar))) | 711 | || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar) |
| 712 | || EQ (XCAR (position), Qtool_bar)))) | ||
| 712 | { | 713 | { |
| 713 | /* Use the mouse's current position. */ | 714 | /* Use the mouse's current position. */ |
| 714 | FRAME_PTR new_f = SELECTED_FRAME (); | 715 | FRAME_PTR new_f = SELECTED_FRAME (); |
| @@ -906,7 +907,8 @@ on the left of the dialog box and all following items on the right.\n\ | |||
| 906 | 907 | ||
| 907 | /* Decode the first argument: find the window or frame to use. */ | 908 | /* Decode the first argument: find the window or frame to use. */ |
| 908 | if (EQ (position, Qt) | 909 | if (EQ (position, Qt) |
| 909 | || (CONSP (position) && EQ (XCAR (position), Qmenu_bar))) | 910 | || (CONSP (position) && (EQ (XCAR (position), Qmenu_bar) |
| 911 | || EQ (XCAR (position), Qtool_bar)))) | ||
| 910 | { | 912 | { |
| 911 | #if 0 /* Using the frame the mouse is on may not be right. */ | 913 | #if 0 /* Using the frame the mouse is on may not be right. */ |
| 912 | /* Use the mouse's current position. */ | 914 | /* Use the mouse's current position. */ |