comparison src/xmenu.c @ 7335:73d1276933e1

(xmenu_show): Disallow empty menus.
author Karl Heuer <kwzh@gnu.org>
date Thu, 05 May 1994 06:31:28 +0000
parents fcea4173315d
children ac210d94f33f
comparison
equal deleted inserted replaced
7334:fcea4173315d 7335:73d1276933e1
1397 1397
1398 Position root_x, root_y; 1398 Position root_x, root_y;
1399 1399
1400 *error = NULL; 1400 *error = NULL;
1401 1401
1402 if (menu_items_used <= MENU_ITEMS_PANE_LENGTH)
1403 {
1404 *error = "Empty menu";
1405 return Qnil;
1406 }
1402 this_menu_bar_item_beg = -1; 1407 this_menu_bar_item_beg = -1;
1403 this_menu_bar_item_end = -1; 1408 this_menu_bar_item_end = -1;
1404 last_menu_bar_item_end = -1; 1409 last_menu_bar_item_end = -1;
1405 1410
1406 /* Figure out which menu bar item, if any, this menu is for. */ 1411 /* Figure out which menu bar item, if any, this menu is for. */
2008 2013
2009 *error = 0; 2014 *error = 0;
2010 if (menu_items_n_panes == 0) 2015 if (menu_items_n_panes == 0)
2011 return Qnil; 2016 return Qnil;
2012 2017
2018 if (menu_items_used <= MENU_ITEMS_PANE_LENGTH)
2019 {
2020 *error = "Empty menu";
2021 return Qnil;
2022 }
2023
2013 /* Figure out which root window F is on. */ 2024 /* Figure out which root window F is on. */
2014 XGetGeometry (x_current_display, FRAME_X_WINDOW (f), &root, 2025 XGetGeometry (x_current_display, FRAME_X_WINDOW (f), &root,
2015 &dummy_int, &dummy_int, &dummy_uint, &dummy_uint, 2026 &dummy_int, &dummy_int, &dummy_uint, &dummy_uint,
2016 &dummy_uint, &dummy_uint); 2027 &dummy_uint, &dummy_uint);
2017 2028