Mercurial > hg > xemacs-beta
comparison src/menubar-msw.c @ 440:8de8e3f6228a r21-2-28
Import from CVS: tag r21-2-28
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:33:38 +0200 |
parents | 3ecd8885ac67 |
children | abe6d1db359e |
comparison
equal
deleted
inserted
replaced
439:357dd071b03c | 440:8de8e3f6228a |
---|---|
276 else if (CONSP (item)) | 276 else if (CONSP (item)) |
277 { | 277 { |
278 /* Submenu */ | 278 /* Submenu */ |
279 HMENU submenu; | 279 HMENU submenu; |
280 Lisp_Object gui_item = allocate_gui_item (); | 280 Lisp_Object gui_item = allocate_gui_item (); |
281 struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item); | 281 Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item); |
282 struct gcpro gcpro1; | 282 struct gcpro gcpro1; |
283 | 283 |
284 GCPRO1 (gui_item); | 284 GCPRO1 (gui_item); |
285 | 285 |
286 menu_parse_submenu_keywords (item, gui_item); | 286 menu_parse_submenu_keywords (item, gui_item); |
326 else if (VECTORP (item)) | 326 else if (VECTORP (item)) |
327 { | 327 { |
328 /* An ordinary item */ | 328 /* An ordinary item */ |
329 Lisp_Object style, id; | 329 Lisp_Object style, id; |
330 Lisp_Object gui_item = gui_parse_item_keywords (item); | 330 Lisp_Object gui_item = gui_parse_item_keywords (item); |
331 struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item); | 331 Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item); |
332 struct gcpro gcpro1; | 332 struct gcpro gcpro1; |
333 | 333 |
334 GCPRO1 (gui_item); | 334 GCPRO1 (gui_item); |
335 | 335 |
336 if (!gui_item_included_p (gui_item, Vmenubar_configuration)) | 336 if (!gui_item_included_p (gui_item, Vmenubar_configuration)) |
391 Lisp_Object item_desc; | 391 Lisp_Object item_desc; |
392 int deep_p, flush_right; | 392 int deep_p, flush_right; |
393 struct gcpro gcpro1; | 393 struct gcpro gcpro1; |
394 unsigned long checksum; | 394 unsigned long checksum; |
395 Lisp_Object gui_item = allocate_gui_item (); | 395 Lisp_Object gui_item = allocate_gui_item (); |
396 struct Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item); | 396 Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item); |
397 GCPRO1 (gui_item); | 397 GCPRO1 (gui_item); |
398 | 398 |
399 /* We are sometimes called with the menubar unchanged, and with changed | 399 /* We are sometimes called with the menubar unchanged, and with changed |
400 right flush. We have to update the menubar in this case, | 400 right flush. We have to update the menubar in this case, |
401 so account for the compliance setting in the hash value */ | 401 so account for the compliance setting in the hash value */ |
734 | 734 |
735 static void | 735 static void |
736 mswindows_popup_menu (Lisp_Object menu_desc, Lisp_Object event) | 736 mswindows_popup_menu (Lisp_Object menu_desc, Lisp_Object event) |
737 { | 737 { |
738 struct frame *f = selected_frame (); | 738 struct frame *f = selected_frame (); |
739 struct Lisp_Event *eev = NULL; | 739 Lisp_Event *eev = NULL; |
740 HMENU menu; | 740 HMENU menu; |
741 POINT pt; | 741 POINT pt; |
742 int ok; | 742 int ok; |
743 | 743 |
744 if (!NILP (event)) | 744 if (!NILP (event)) |