Mercurial > emacs
comparison src/xmenu.c @ 58283:c163562b2d59
* xmenu.c (x_menu_in_use): Removed.
(x_menu_set_in_use): Also set popup_activated_flag.
* xfns.c (Fx_file_dialog): Call popup_activated instead of
x_menu_in_use. Call x_menu_set_in_use in Motif version also.
* xterm.h: (x_menu_in_use): Removed.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 16 Nov 2004 20:52:32 +0000 |
| parents | 7f6d41c2adbe |
| children | 8da33d42472e 2a3f27a45698 b637c617432f |
comparison
equal
deleted
inserted
replaced
| 58282:7c3f5740a5cc | 58283:c163562b2d59 |
|---|---|
| 1116 } | 1116 } |
| 1117 | 1117 |
| 1118 | 1118 |
| 1119 #ifndef MSDOS | 1119 #ifndef MSDOS |
| 1120 | 1120 |
| 1121 /* Return non-zero if a dialog or popup menu is already popped up. */ | |
| 1122 | |
| 1123 int | |
| 1124 x_menu_in_use () | |
| 1125 { | |
| 1126 return ! NILP (menu_items_inuse); | |
| 1127 } | |
| 1128 | |
| 1129 /* Set menu_items_inuse so no other popup menu or dialog is created. */ | 1121 /* Set menu_items_inuse so no other popup menu or dialog is created. */ |
| 1130 | 1122 |
| 1131 void | 1123 void |
| 1132 x_menu_set_in_use (in_use) | 1124 x_menu_set_in_use (in_use) |
| 1133 int in_use; | 1125 int in_use; |
| 1134 { | 1126 { |
| 1135 menu_items_inuse = in_use ? Qt : Qnil; | 1127 menu_items_inuse = in_use ? Qt : Qnil; |
| 1128 popup_activated_flag = in_use; | |
| 1136 } | 1129 } |
| 1137 | 1130 |
| 1138 /* Wait for an X event to arrive or for a timer to expire. */ | 1131 /* Wait for an X event to arrive or for a timer to expire. */ |
| 1139 | 1132 |
| 1140 void | 1133 void |