Mercurial > emacs
comparison src/xmenu.c @ 17364:573189779804
(Fx_popup_menu): Don't use Lisp_Object as integer.
(set_frame_menubar): Likewise.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Thu, 10 Apr 1997 21:19:16 +0000 |
parents | 6409ef81a2a8 |
children | 0a75fcee3cb8 |
comparison
equal
deleted
inserted
replaced
17363:0fe9203c7a06 | 17364:573189779804 |
---|---|
854 else if (WINDOWP (window)) | 854 else if (WINDOWP (window)) |
855 { | 855 { |
856 CHECK_LIVE_WINDOW (window, 0); | 856 CHECK_LIVE_WINDOW (window, 0); |
857 f = XFRAME (WINDOW_FRAME (XWINDOW (window))); | 857 f = XFRAME (WINDOW_FRAME (XWINDOW (window))); |
858 | 858 |
859 xpos = (FONT_WIDTH (f->output_data.x->font) * XWINDOW (window)->left); | 859 xpos = (FONT_WIDTH (f->output_data.x->font) |
860 ypos = (f->output_data.x->line_height * XWINDOW (window)->top); | 860 * XFASTINT (XWINDOW (window)->left)); |
861 ypos = (f->output_data.x->line_height | |
862 * XFASTINT (XWINDOW (window)->top)); | |
861 } | 863 } |
862 else | 864 else |
863 /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME, | 865 /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME, |
864 but I don't want to make one now. */ | 866 but I don't want to make one now. */ |
865 CHECK_WINDOW (window, 0); | 867 CHECK_WINDOW (window, 0); |
1731 /* If there has been no change in the Lisp-level contents | 1733 /* If there has been no change in the Lisp-level contents |
1732 of the menu bar, skip redisplaying it. Just exit. */ | 1734 of the menu bar, skip redisplaying it. Just exit. */ |
1733 | 1735 |
1734 for (i = 0; i < previous_menu_items_used; i++) | 1736 for (i = 0; i < previous_menu_items_used; i++) |
1735 if (menu_items_used == i | 1737 if (menu_items_used == i |
1736 || (previous_items[i] != XVECTOR (menu_items)->contents[i])) | 1738 || (!EQ (previous_items[i], XVECTOR (menu_items)->contents[i]))) |
1737 break; | 1739 break; |
1738 if (i == menu_items_used && i == previous_menu_items_used && i != 0) | 1740 if (i == menu_items_used && i == previous_menu_items_used && i != 0) |
1739 { | 1741 { |
1740 free_menubar_widget_value_tree (first_wv); | 1742 free_menubar_widget_value_tree (first_wv); |
1741 menu_items = Qnil; | 1743 menu_items = Qnil; |