Mercurial > hg > xemacs-beta
comparison src/menubar-msw.c @ 288:e11d67e05968 r21-0b42
Import from CVS: tag r21-0b42
author | cvs |
---|---|
date | Mon, 13 Aug 2007 10:35:54 +0200 |
parents | 57709be46d1b |
children | 70ad99077275 |
comparison
equal
deleted
inserted
replaced
287:13a0bd77a29d | 288:e11d67e05968 |
---|---|
592 /* #### - this menubar update mechanism is expensively anti-social and | 592 /* #### - this menubar update mechanism is expensively anti-social and |
593 the activate-menubar-hook is now mostly obsolete. */ | 593 the activate-menubar-hook is now mostly obsolete. */ |
594 | 594 |
595 /* We simply ignore return value. In any case, we construct the bar | 595 /* We simply ignore return value. In any case, we construct the bar |
596 on the fly */ | 596 on the fly */ |
597 run_hook (Vactivate_menubar_hook); | 597 run_hook (Qactivate_menubar_hook); |
598 | 598 |
599 update_frame_menubar_maybe (f); | 599 update_frame_menubar_maybe (f); |
600 | 600 |
601 current_menudesc = current_frame_menubar (f); | 601 current_menudesc = current_frame_menubar (f); |
602 current_hashtable = FRAME_MSWINDOWS_MENU_HASHTABLE(f); | 602 current_hashtable = FRAME_MSWINDOWS_MENU_HASHTABLE(f); |
629 menu_cleanup(), and will not gcpro the data any more */ | 629 menu_cleanup(), and will not gcpro the data any more */ |
630 GCPRO1 (data); | 630 GCPRO1 (data); |
631 menu_cleanup (f); | 631 menu_cleanup (f); |
632 | 632 |
633 /* Ok, this is our one. Enqueue it. */ | 633 /* Ok, this is our one. Enqueue it. */ |
634 get_callback (data, &fn, &arg); | 634 get_gui_callback (data, &fn, &arg); |
635 | |
636 XSETFRAME (frame, f); | 635 XSETFRAME (frame, f); |
637 enqueue_misc_user_event (frame, fn, arg); | 636 mswindows_enqueue_misc_user_event (frame, fn, arg); |
638 | |
639 /* Needs good bump also, for WM_COMMAND may have been dispatched from | |
640 mswindows_need_event, which will block again despite new command | |
641 event has arrived */ | |
642 mswindows_bump_queue (); | |
643 | 637 |
644 UNGCPRO; /* data */ | 638 UNGCPRO; /* data */ |
645 return Qt; | 639 return Qt; |
646 } | 640 } |
647 | 641 |