diff options
| author | Jason Rumney | 2008-06-09 21:54:36 +0000 |
|---|---|---|
| committer | Jason Rumney | 2008-06-09 21:54:36 +0000 |
| commit | 4abe21a973ed11ed9f4ce282de8269769413c0db (patch) | |
| tree | 972c1a6f244d4733daed12f566514d3b1780f2a7 /src | |
| parent | 0c2258fc7c30bfb03a7be8a6fb896f5a695a7bd5 (diff) | |
| download | emacs-4abe21a973ed11ed9f4ce282de8269769413c0db.tar.gz emacs-4abe21a973ed11ed9f4ce282de8269769413c0db.zip | |
(parse_single_submenu): Remove.
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32menu.c | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/src/w32menu.c b/src/w32menu.c index 4bed9f6f8ef..a2936bc8e41 100644 --- a/src/w32menu.c +++ b/src/w32menu.c | |||
| @@ -92,9 +92,6 @@ extern Lisp_Object Qmenu_bar_update_hook; | |||
| 92 | 92 | ||
| 93 | void set_frame_menubar P_ ((FRAME_PTR, int, int)); | 93 | void set_frame_menubar P_ ((FRAME_PTR, int, int)); |
| 94 | 94 | ||
| 95 | static void push_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, | ||
| 96 | Lisp_Object, Lisp_Object, Lisp_Object, | ||
| 97 | Lisp_Object, Lisp_Object)); | ||
| 98 | #ifdef HAVE_DIALOGS | 95 | #ifdef HAVE_DIALOGS |
| 99 | static Lisp_Object w32_dialog_show P_ ((FRAME_PTR, int, Lisp_Object, char**)); | 96 | static Lisp_Object w32_dialog_show P_ ((FRAME_PTR, int, Lisp_Object, char**)); |
| 100 | #else | 97 | #else |
| @@ -626,59 +623,6 @@ menubar_selection_callback (FRAME_PTR f, void * client_data) | |||
| 626 | } | 623 | } |
| 627 | 624 | ||
| 628 | 625 | ||
| 629 | /* Set up data i menu_items for a menu bar item | ||
| 630 | whose event type is ITEM_KEY (with string ITEM_NAME) | ||
| 631 | and whose contents come from the list of keymaps MAPS. */ | ||
| 632 | |||
| 633 | static int | ||
| 634 | parse_single_submenu (item_key, item_name, maps) | ||
| 635 | Lisp_Object item_key, item_name, maps; | ||
| 636 | { | ||
| 637 | Lisp_Object length; | ||
| 638 | int len; | ||
| 639 | Lisp_Object *mapvec; | ||
| 640 | int i; | ||
| 641 | int top_level_items = 0; | ||
| 642 | |||
| 643 | length = Flength (maps); | ||
| 644 | len = XINT (length); | ||
| 645 | |||
| 646 | /* Convert the list MAPS into a vector MAPVEC. */ | ||
| 647 | mapvec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object)); | ||
| 648 | for (i = 0; i < len; i++) | ||
| 649 | { | ||
| 650 | mapvec[i] = Fcar (maps); | ||
| 651 | maps = Fcdr (maps); | ||
| 652 | } | ||
| 653 | |||
| 654 | /* Loop over the given keymaps, making a pane for each map. | ||
| 655 | But don't make a pane that is empty--ignore that map instead. */ | ||
| 656 | for (i = 0; i < len; i++) | ||
| 657 | { | ||
| 658 | if (SYMBOLP (mapvec[i]) | ||
| 659 | || (CONSP (mapvec[i]) && !KEYMAPP (mapvec[i]))) | ||
| 660 | { | ||
| 661 | /* Here we have a command at top level in the menu bar | ||
| 662 | as opposed to a submenu. */ | ||
| 663 | top_level_items = 1; | ||
| 664 | push_menu_pane (Qnil, Qnil); | ||
| 665 | push_menu_item (item_name, Qt, item_key, mapvec[i], | ||
| 666 | Qnil, Qnil, Qnil, Qnil); | ||
| 667 | } | ||
| 668 | else | ||
| 669 | { | ||
| 670 | Lisp_Object prompt; | ||
| 671 | prompt = Fkeymap_prompt (mapvec[i]); | ||
| 672 | single_keymap_panes (mapvec[i], | ||
| 673 | !NILP (prompt) ? prompt : item_name, | ||
| 674 | item_key, 0, 10); | ||
| 675 | } | ||
| 676 | } | ||
| 677 | |||
| 678 | return top_level_items; | ||
| 679 | } | ||
| 680 | |||
| 681 | |||
| 682 | /* Create a tree of widget_value objects | 626 | /* Create a tree of widget_value objects |
| 683 | representing the panes and items | 627 | representing the panes and items |
| 684 | in menu_items starting at index START, up to index END. */ | 628 | in menu_items starting at index START, up to index END. */ |