xemacs-beta: src/menubar-msw.c comparison

comparison src/menubar-msw.c @ 363:972bbb6d6ca2 r21-1-11

Import from CVS: tag r21-1-11

author	cvs
date	Mon, 13 Aug 2007 10:59:28 +0200
parents	fbbf69b4e8a7
children	a4f53d9b3154

comparison

equal deleted inserted replaced

-:1e474c183006
+:972bbb6d6ca2
 {
 /* Submenu */
 HMENU submenu;
 struct gui_item gui_item;
 struct gcpro gcpro1;
+struct gcpro ngcpro1;
 gui_item_init (&gui_item);
 GCPRO_GUI_ITEM (&gui_item);
+NGCPRO1 (path);
 menu_parse_submenu_keywords (item, &gui_item);
 if (!STRINGP (gui_item.name))
 	signal_simple_error ("Menu name (first element) must be a string", item);
 if (!gui_item_included_p (&gui_item, Vmenubar_configuration))
-	return;
+	{
+	  NUNGCPRO;
+	  UNGCPRO;
+	  return;
+	}
 if (!gui_item_active_p (&gui_item))
 	item_info.fState = MFS_GRAYED;
 /* Temptation is to put 'else' right here. Although, the
 	 displayed item won't have an arrow indicating that it is a
 	    }
 	  /* Fputhash GCPRO'es PATH */
 	  Fputhash (hmenu_to_lisp_object (submenu), path, hash_tab);
 	}
+NUNGCPRO;
 UNGCPRO; /* gui_item */
 }
 else if (VECTORP (item))
 {
 /* An ordinary item */
 Lisp_Object item_desc;
 int deep_p, flush_right;
 struct gcpro gcpro1;
 unsigned long checksum;
 struct gui_item gui_item;
+struct gcpro ngcpro1;
 gui_item_init (&gui_item);
 GCPRO_GUI_ITEM (&gui_item);
+NGCPRO1 (desc);
 /* We are sometimes called with the menubar unchanged, and with changed
 right flush. We have to update the menubar in ths case,
 so account for the compliance setting in the hash value */
 checksum = REPLACE_ME_WITH_GLOBAL_VARIABLE_WHICH_CONTROLS_RIHGT_FLUSH;
 		      0, XSTRING_DATA(gui_item.name));
 	  InsertMenu (menu, 1, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
 	  SetMenuDefaultItem (menu, 0, MF_BYPOSITION);
 	}
 }
+NUNGCPRO;
 UNGCPRO; /* gui_item */
 return checksum;
 }
 static void
 HMENU menubar = GetMenu (FRAME_MSWINDOWS_HANDLE (f));
 struct window *w = XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f));
 Lisp_Object desc = (!NILP (w->menubar_visible_p)
 		      ? symbol_value_in_buffer (Qcurrent_menubar, w->buffer)
 		      : Qnil);
+struct gcpro gcpro1;
+GCPRO1 (desc); /* it's safest to do this, just in case some filter
+		    or something changes the value of current-menubar */
 top_level_menu = menubar;
 if (NILP (desc) && menubar != NULL)
 {
 /* Menubar has gone */
 FRAME_MSWINDOWS_MENU_HASHTABLE(f) = Qnil;
 SetMenu (FRAME_MSWINDOWS_HANDLE (f), NULL);
 DestroyMenu (menubar);
 DrawMenuBar (FRAME_MSWINDOWS_HANDLE (f));
+UNGCPRO;
 return;
 }
 if (!NILP (desc) && menubar == NULL)
 {
 }
 if (NILP (desc))
 {
 /* We did not have the bar and are not going to */
+UNGCPRO;
 return;
 }
 /* Now we bail out if the menubar has not changed */
 if (FRAME_MSWINDOWS_MENU_CHECKSUM(f) == checksum_menu (desc))
-return;
+{
+UNGCPRO;
+return;
+}
 populate:
 /* Come with empty hash table */
 if (NILP (FRAME_MSWINDOWS_MENU_HASHTABLE(f)))
 FRAME_MSWINDOWS_MENU_HASHTABLE(f) = Fmake_hashtable (make_int (50), Qequal);
 		 FRAME_MSWINDOWS_MENU_HASHTABLE(f), 1);
 SetMenu (FRAME_MSWINDOWS_HANDLE (f), menubar);
 DrawMenuBar (FRAME_MSWINDOWS_HANDLE (f));
 FRAME_MSWINDOWS_MENU_CHECKSUM(f) = checksum_menu (desc);
+UNGCPRO;
 }
 static void
 prune_menubar (struct frame *f)
 {
 HMENU menubar = GetMenu (FRAME_MSWINDOWS_HANDLE (f));
 Lisp_Object desc = current_frame_menubar (f);
+struct gcpro gcpro1;
 if (menubar == NULL)
 return;
 /* #### If a filter function has set desc to Qnil, this abort()
 triggers. To resolve, we must prevent filters explicitely from
 Is copy-tree on the whole menu too expensive? */
 if (NILP(desc))
 /* abort(); */
 return;
+GCPRO1 (desc); /* just to be safe -- see above */
 /* We do the trick by removing all items and re-populating top level */
 empty_menu (menubar, 0);
 assert (HASHTABLEP (FRAME_MSWINDOWS_MENU_HASHTABLE(f)));
 Fclrhash (FRAME_MSWINDOWS_MENU_HASHTABLE(f));
 Fputhash (hmenu_to_lisp_object (menubar), Qnil,
 	    FRAME_MSWINDOWS_MENU_HASHTABLE(f));
 populate_menu (menubar, Qnil, desc,
 		 FRAME_MSWINDOWS_MENU_HASHTABLE(f), 1);
+UNGCPRO;
 }
 /*
 * This is called when cleanup is possible. It is better not to
 * clean things up at all than do it too earaly!
 struct frame *f = selected_frame ();
 struct Lisp_Event *eev = NULL;
 HMENU menu;
 POINT pt;
 int ok;
+struct gcpro gcpro1;
+GCPRO1 (menu_desc); /* to be safe -- see above */
 if (!NILP (event))
 {
 CHECK_LIVE_EVENT (event);
 eev = XEVENT (event);
 if (!ok) {
 menu_cleanup (f);
 signal_simple_error ("Cannot track popup menu while in menu",
 			 menu_desc);
 }
+UNGCPRO;
 }
 /*------------------------------------------------------------------------*/
 /* Initialization                                                         */

Mercurial > hg > xemacs-beta

comparison src/menubar-msw.c @ 363:972bbb6d6ca2 r21-1-11