comparison src/menubar-gtk.c @ 771:943eaba38521

[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents 02339d4ebed4
children e38acbeb1cae
comparison
equal deleted inserted replaced
770:336a418893b5 771:943eaba38521
863 } 863 }
864 } 864 }
865 865
866 static GtkWidget *menu_descriptor_to_widget (Lisp_Object descr) 866 static GtkWidget *menu_descriptor_to_widget (Lisp_Object descr)
867 { 867 {
868 int count = specpdl_depth ();
869 GtkWidget *rval = NULL; 868 GtkWidget *rval = NULL;
870 869 int count = begin_gc_forbidden ();
871 record_unwind_protect (restore_gc_inhibit, make_int (gc_currently_forbidden));
872
873 gc_currently_forbidden = 1;
874 870
875 /* Cannot GC from here on out... */ 871 /* Cannot GC from here on out... */
876 rval = menu_descriptor_to_widget_1 (descr); 872 rval = menu_descriptor_to_widget_1 (descr);
877 unbind_to (count, Qnil); 873 unbind_to (count);
878 return (rval); 874 return (rval);
879 875
880 } 876 }
881 877
882 static gboolean 878 static gboolean
1106 Fset_buffer (XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer); 1102 Fset_buffer (XWINDOW (FRAME_SELECTED_WINDOW (f))->buffer);
1107 1103
1108 menu_create_menubar (f, menubar); 1104 menu_create_menubar (f, menubar);
1109 1105
1110 Fset_buffer (old_buffer); 1106 Fset_buffer (old_buffer);
1111 unbind_to (count, Qnil); 1107 unbind_to (count);
1112 } 1108 }
1113 1109
1114 FRAME_MENUBAR_DATA (f) = Fcons (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->buffer, Qt); 1110 FRAME_MENUBAR_DATA (f) = Fcons (XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->buffer, Qt);
1115 1111
1116 return (menubar_visible); 1112 return (menubar_visible);