Mercurial > hg > xemacs-beta

comparison src/menubar-gtk.c @ 5118:e0db3c197671 ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 8f1ee2d15784
children 4aebb0131297
comparison
equal deleted inserted replaced
5117:3742ea8250b5 5118:e0db3c197671
664 gtk_object_set_data (GTK_OBJECT (menu_item), XEMACS_MENU_DESCR_TAG, LISP_TO_VOID (desc)); 664 gtk_object_set_data (GTK_OBJECT (menu_item), XEMACS_MENU_DESCR_TAG, LISP_TO_VOID (desc));
665 gtk_object_set_data (GTK_OBJECT (menu_item), XEMACS_MENU_FILTER_TAG, LISP_TO_VOID (hook_fn)); 665 gtk_object_set_data (GTK_OBJECT (menu_item), XEMACS_MENU_FILTER_TAG, LISP_TO_VOID (hook_fn));
666 666
667 if ((!NILP (config_tag) 667 if ((!NILP (config_tag)
668 && NILP (Fmemq (config_tag, Vmenubar_configuration))) 668 && NILP (Fmemq (config_tag, Vmenubar_configuration)))
669 || (included_spec && NILP (Feval (include_p)))) 669 || (included_spec &&
670 NILP (IGNORE_MULTIPLE_VALUES (Feval (include_p)))))
670 { 671 {
671 return (NULL); 672 return (NULL);
672 } 673 }
673 674
674 if (active_spec) 675 if (active_spec)
675 active_p = Feval (active_p); 676 active_p = IGNORE_MULTIPLE_VALUES (Feval (active_p));
676 677
677 gtk_widget_set_sensitive (GTK_WIDGET (menu_item), ! NILP (active_p)); 678 gtk_widget_set_sensitive (GTK_WIDGET (menu_item), ! NILP (active_p));
678 } 679 }
679 else 680 else
680 { 681 {
851 } 852 }
852 } 853 }
853 854
854 #ifdef HAVE_MENUBARS 855 #ifdef HAVE_MENUBARS
855 if ((!NILP (config_tag) && NILP (Fmemq (config_tag, Vmenubar_configuration))) 856 if ((!NILP (config_tag) && NILP (Fmemq (config_tag, Vmenubar_configuration)))
856 || (included_spec && NILP (Feval (include_p)))) 857 || (included_spec && NILP (IGNORE_MULTIPLE_VALUES (Feval (include_p)))))
858
857 { 859 {
858 /* the include specification says to ignore this item. */ 860 /* the include specification says to ignore this item. */
859 return 0; 861 return 0;
860 } 862 }
861 #endif /* HAVE_MENUBARS */ 863 #endif /* HAVE_MENUBARS */
864 866
865 if (NILP (accel)) 867 if (NILP (accel))
866 accel = menu_name_to_accelerator (XSTRING_DATA (name)); 868 accel = menu_name_to_accelerator (XSTRING_DATA (name));
867 869
868 if (!NILP (suffix)) 870 if (!NILP (suffix))
869 suffix = Feval (suffix); 871 suffix = IGNORE_MULTIPLE_VALUES (Feval (suffix));
872
870 873
871 if (!separator_string_p (XSTRING_DATA (name))) 874 if (!separator_string_p (XSTRING_DATA (name)))
872 { 875 {
873 Ibyte *label_buffer = NULL; 876 Ibyte *label_buffer = NULL;
874 char *temp_label = NULL; 877 char *temp_label = NULL;
899 { 902 {
900 /* Do nothing */ 903 /* Do nothing */
901 } 904 }
902 else 905 else
903 { 906 {
904 selected_p = Feval (selected_p); 907 selected_p = IGNORE_MULTIPLE_VALUES (Feval (selected_p));
905 } 908 }
906 } 909 }
907 910
908 if (NILP (active_p) || EQ (active_p, Qt)) 911 if (NILP (active_p) || EQ (active_p, Qt))
909 { 912 {
910 /* Do Nothing */ 913 /* Do Nothing */
911 } 914 }
912 else 915 else
913 { 916 {
914 active_p = Feval (active_p); 917 active_p = IGNORE_MULTIPLE_VALUES (Feval (active_p));
915 } 918 }
916 919
917 if (0 || 920 if (0 ||
918 #ifdef HAVE_MENUBARS 921 #ifdef HAVE_MENUBARS
919 menubar_show_keybindings 922 menubar_show_keybindings