Mercurial > emacs
comparison src/xfns.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 | aaad85fd645c |
| children | 86fddd350b35 2a3f27a45698 b637c617432f |
comparison
equal
deleted
inserted
replaced
| 58282:7c3f5740a5cc | 58283:c163562b2d59 |
|---|---|
| 5142 int count = SPECPDL_INDEX (); | 5142 int count = SPECPDL_INDEX (); |
| 5143 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; | 5143 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; |
| 5144 | 5144 |
| 5145 GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file); | 5145 GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file); |
| 5146 | 5146 |
| 5147 if (x_menu_in_use ()) | 5147 if (popup_activated ()) |
| 5148 error ("Trying to use a menu from within a menu-entry"); | 5148 error ("Trying to use a menu from within a menu-entry"); |
| 5149 | 5149 |
| 5150 CHECK_STRING (prompt); | 5150 CHECK_STRING (prompt); |
| 5151 CHECK_STRING (dir); | 5151 CHECK_STRING (dir); |
| 5152 | 5152 |
| 5230 } | 5230 } |
| 5231 | 5231 |
| 5232 record_unwind_protect (clean_up_file_dialog, make_save_value (dialog, 0)); | 5232 record_unwind_protect (clean_up_file_dialog, make_save_value (dialog, 0)); |
| 5233 | 5233 |
| 5234 /* Process events until the user presses Cancel or OK. */ | 5234 /* Process events until the user presses Cancel or OK. */ |
| 5235 x_menu_set_in_use (1); | |
| 5235 result = 0; | 5236 result = 0; |
| 5236 while (result == 0) | 5237 while (result == 0) |
| 5237 { | 5238 { |
| 5238 XEvent event; | 5239 XEvent event; |
| 5239 x_menu_wait_for_event (0); | 5240 x_menu_wait_for_event (0); |
| 5295 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; | 5296 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6; |
| 5296 char *cdef_file; | 5297 char *cdef_file; |
| 5297 | 5298 |
| 5298 GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file); | 5299 GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file); |
| 5299 | 5300 |
| 5300 if (x_menu_in_use ()) | 5301 if (popup_activated ()) |
| 5301 error ("Trying to use a menu from within a menu-entry"); | 5302 error ("Trying to use a menu from within a menu-entry"); |
| 5302 | 5303 |
| 5303 CHECK_STRING (prompt); | 5304 CHECK_STRING (prompt); |
| 5304 CHECK_STRING (dir); | 5305 CHECK_STRING (dir); |
| 5305 | 5306 |