Mercurial > emacs

comparison src/xmenu.c @ 58171:e08eaff3b8ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(pop_down_menu): Return nil.
author Kim F. Storm <storm@cua.dk>
date Fri, 12 Nov 2004 13:46:39 +0000
parents 66ace4a9a250
children 6c24ca598cb1 3ec251523b3e
comparison
equal deleted inserted replaced
58170:66ace4a9a250 58171:e08eaff3b8ab
522 UNGCPRO; 522 UNGCPRO;
523 if (!res) 523 if (!res)
524 return; /* Not a menu item. */ 524 return; /* Not a menu item. */
525 525
526 map = XVECTOR (item_properties)->contents[ITEM_PROPERTY_MAP]; 526 map = XVECTOR (item_properties)->contents[ITEM_PROPERTY_MAP];
527 527
528 if (skp->notreal) 528 if (skp->notreal)
529 { 529 {
530 /* We don't want to make a menu, just traverse the keymaps to 530 /* We don't want to make a menu, just traverse the keymaps to
531 precompute equivalent key bindings. */ 531 precompute equivalent key bindings. */
532 if (!NILP (map)) 532 if (!NILP (map))
1096 if (NILP (Fcar (Fcdr (contents)))) 1096 if (NILP (Fcar (Fcdr (contents))))
1097 /* No buttons specified, add an "Ok" button so users can pop down 1097 /* No buttons specified, add an "Ok" button so users can pop down
1098 the dialog. Also, the lesstif/motif version crashes if there are 1098 the dialog. Also, the lesstif/motif version crashes if there are
1099 no buttons. */ 1099 no buttons. */
1100 contents = Fcons (title, Fcons (Fcons (build_string ("Ok"), Qt), Qnil)); 1100 contents = Fcons (title, Fcons (Fcons (build_string ("Ok"), Qt), Qnil));
1101 1101
1102 list_of_panes (Fcons (contents, Qnil)); 1102 list_of_panes (Fcons (contents, Qnil));
1103 1103
1104 /* Display them in a dialog box. */ 1104 /* Display them in a dialog box. */
1105 BLOCK_INPUT; 1105 BLOCK_INPUT;
1106 selection = xdialog_show (f, 0, title, &error_name); 1106 selection = xdialog_show (f, 0, title, &error_name);
1176 static Lisp_Object 1176 static Lisp_Object
1177 pop_down_menu (dummy) 1177 pop_down_menu (dummy)
1178 int dummy; 1178 int dummy;
1179 { 1179 {
1180 popup_activated_flag = 0; 1180 popup_activated_flag = 0;
1181 return Qnil;
1181 } 1182 }
1182 1183
1183 /* Loop in Xt until the menu pulldown or dialog popup has been 1184 /* Loop in Xt until the menu pulldown or dialog popup has been
1184 popped down (deactivated). This is used for x-popup-menu 1185 popped down (deactivated). This is used for x-popup-menu
1185 and x-popup-dialog; it is not used for the menu bar. 1186 and x-popup-dialog; it is not used for the menu bar.
1270 { 1271 {
1271 gtk_widget_unmap (current_menu); 1272 gtk_widget_unmap (current_menu);
1272 current_menu = 0; 1273 current_menu = 0;
1273 popup_activated_flag = 0; 1274 popup_activated_flag = 0;
1274 } 1275 }
1276 return Qnil;
1275 } 1277 }
1276 1278
1277 static void 1279 static void
1278 popup_widget_loop (do_timers, widget) 1280 popup_widget_loop (do_timers, widget)
1279 int do_timers; 1281 int do_timers;
2415 { 2417 {
2416 struct next_popup_x_y* data = (struct next_popup_x_y*)user_data; 2418 struct next_popup_x_y* data = (struct next_popup_x_y*)user_data;
2417 GtkRequisition req; 2419 GtkRequisition req;
2418 int disp_width = FRAME_X_DISPLAY_INFO (data->f)->width; 2420 int disp_width = FRAME_X_DISPLAY_INFO (data->f)->width;
2419 int disp_height = FRAME_X_DISPLAY_INFO (data->f)->height; 2421 int disp_height = FRAME_X_DISPLAY_INFO (data->f)->height;
2420 2422
2421 *x = data->x; 2423 *x = data->x;
2422 *y = data->y; 2424 *y = data->y;
2423 2425
2424 /* Check if there is room for the menu. If not, adjust x/y so that 2426 /* Check if there is room for the menu. If not, adjust x/y so that
2425 the menu is fully visible. */ 2427 the menu is fully visible. */