Mercurial > emacs
comparison src/w32menu.c @ 40656:cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
| author | Pavel Janík <Pavel@Janik.cz> |
|---|---|
| date | Fri, 02 Nov 2001 20:46:55 +0000 |
| parents | 18b1b133e5c1 |
| children | f66d09d1bb2f |
comparison
equal
deleted
inserted
replaced
| 40655:45453187feeb | 40656:cdfd4d09b79a |
|---|---|
| 546 for (tail = menu; !NILP (tail); tail = Fcdr (tail)) | 546 for (tail = menu; !NILP (tail); tail = Fcdr (tail)) |
| 547 { | 547 { |
| 548 Lisp_Object elt, pane_name, pane_data; | 548 Lisp_Object elt, pane_name, pane_data; |
| 549 elt = Fcar (tail); | 549 elt = Fcar (tail); |
| 550 pane_name = Fcar (elt); | 550 pane_name = Fcar (elt); |
| 551 CHECK_STRING (pane_name, 0); | 551 CHECK_STRING (pane_name); |
| 552 push_menu_pane (pane_name, Qnil); | 552 push_menu_pane (pane_name, Qnil); |
| 553 pane_data = Fcdr (elt); | 553 pane_data = Fcdr (elt); |
| 554 CHECK_CONS (pane_data, 0); | 554 CHECK_CONS (pane_data); |
| 555 list_of_items (pane_data); | 555 list_of_items (pane_data); |
| 556 } | 556 } |
| 557 | 557 |
| 558 finish_menu_items (); | 558 finish_menu_items (); |
| 559 } | 559 } |
| 573 push_menu_item (item, Qnil, Qnil, Qt, Qnil, Qnil, Qnil, Qnil); | 573 push_menu_item (item, Qnil, Qnil, Qt, Qnil, Qnil, Qnil, Qnil); |
| 574 else if (NILP (item)) | 574 else if (NILP (item)) |
| 575 push_left_right_boundary (); | 575 push_left_right_boundary (); |
| 576 else | 576 else |
| 577 { | 577 { |
| 578 CHECK_CONS (item, 0); | 578 CHECK_CONS (item); |
| 579 item1 = Fcar (item); | 579 item1 = Fcar (item); |
| 580 CHECK_STRING (item1, 1); | 580 CHECK_STRING (item1); |
| 581 push_menu_item (item1, Qt, Fcdr (item), Qt, Qnil, Qnil, Qnil, Qnil); | 581 push_menu_item (item1, Qt, Fcdr (item), Qt, Qnil, Qnil, Qnil, Qnil); |
| 582 } | 582 } |
| 583 } | 583 } |
| 584 } | 584 } |
| 585 | 585 |
| 676 x = Fcar (tem); | 676 x = Fcar (tem); |
| 677 y = Fcdr (tem); | 677 y = Fcdr (tem); |
| 678 } | 678 } |
| 679 } | 679 } |
| 680 | 680 |
| 681 CHECK_NUMBER (x, 0); | 681 CHECK_NUMBER (x); |
| 682 CHECK_NUMBER (y, 0); | 682 CHECK_NUMBER (y); |
| 683 | 683 |
| 684 /* Decode where to put the menu. */ | 684 /* Decode where to put the menu. */ |
| 685 | 685 |
| 686 if (FRAMEP (window)) | 686 if (FRAMEP (window)) |
| 687 { | 687 { |
| 689 xpos = 0; | 689 xpos = 0; |
| 690 ypos = 0; | 690 ypos = 0; |
| 691 } | 691 } |
| 692 else if (WINDOWP (window)) | 692 else if (WINDOWP (window)) |
| 693 { | 693 { |
| 694 CHECK_LIVE_WINDOW (window, 0); | 694 CHECK_LIVE_WINDOW (window); |
| 695 f = XFRAME (WINDOW_FRAME (XWINDOW (window))); | 695 f = XFRAME (WINDOW_FRAME (XWINDOW (window))); |
| 696 | 696 |
| 697 xpos = (FONT_WIDTH (FRAME_FONT (f)) | 697 xpos = (FONT_WIDTH (FRAME_FONT (f)) |
| 698 * XFASTINT (XWINDOW (window)->left)); | 698 * XFASTINT (XWINDOW (window)->left)); |
| 699 ypos = (FRAME_LINE_HEIGHT (f) | 699 ypos = (FRAME_LINE_HEIGHT (f) |
| 700 * XFASTINT (XWINDOW (window)->top)); | 700 * XFASTINT (XWINDOW (window)->top)); |
| 701 } | 701 } |
| 702 else | 702 else |
| 703 /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME, | 703 /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME, |
| 704 but I don't want to make one now. */ | 704 but I don't want to make one now. */ |
| 705 CHECK_WINDOW (window, 0); | 705 CHECK_WINDOW (window); |
| 706 | 706 |
| 707 xpos += XINT (x); | 707 xpos += XINT (x); |
| 708 ypos += XINT (y); | 708 ypos += XINT (y); |
| 709 | 709 |
| 710 XSETFRAME (Vmenu_updating_frame, f); | 710 XSETFRAME (Vmenu_updating_frame, f); |
| 772 } | 772 } |
| 773 else | 773 else |
| 774 { | 774 { |
| 775 /* We were given an old-fashioned menu. */ | 775 /* We were given an old-fashioned menu. */ |
| 776 title = Fcar (menu); | 776 title = Fcar (menu); |
| 777 CHECK_STRING (title, 1); | 777 CHECK_STRING (title); |
| 778 | 778 |
| 779 list_of_panes (Fcdr (menu)); | 779 list_of_panes (Fcdr (menu)); |
| 780 | 780 |
| 781 keymaps = 0; | 781 keymaps = 0; |
| 782 } | 782 } |
| 873 | 873 |
| 874 if (FRAMEP (window)) | 874 if (FRAMEP (window)) |
| 875 f = XFRAME (window); | 875 f = XFRAME (window); |
| 876 else if (WINDOWP (window)) | 876 else if (WINDOWP (window)) |
| 877 { | 877 { |
| 878 CHECK_LIVE_WINDOW (window, 0); | 878 CHECK_LIVE_WINDOW (window); |
| 879 f = XFRAME (WINDOW_FRAME (XWINDOW (window))); | 879 f = XFRAME (WINDOW_FRAME (XWINDOW (window))); |
| 880 } | 880 } |
| 881 else | 881 else |
| 882 /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME, | 882 /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME, |
| 883 but I don't want to make one now. */ | 883 but I don't want to make one now. */ |
| 884 CHECK_WINDOW (window, 0); | 884 CHECK_WINDOW (window); |
| 885 | 885 |
| 886 #ifndef HAVE_DIALOGS | 886 #ifndef HAVE_DIALOGS |
| 887 /* Display a menu with these alternatives | 887 /* Display a menu with these alternatives |
| 888 in the middle of frame F. */ | 888 in the middle of frame F. */ |
| 889 { | 889 { |
| 902 char *error_name; | 902 char *error_name; |
| 903 Lisp_Object selection; | 903 Lisp_Object selection; |
| 904 | 904 |
| 905 /* Decode the dialog items from what was specified. */ | 905 /* Decode the dialog items from what was specified. */ |
| 906 title = Fcar (contents); | 906 title = Fcar (contents); |
| 907 CHECK_STRING (title, 1); | 907 CHECK_STRING (title); |
| 908 | 908 |
| 909 list_of_panes (Fcons (contents, Qnil)); | 909 list_of_panes (Fcons (contents, Qnil)); |
| 910 | 910 |
| 911 /* Display them in a dialog box. */ | 911 /* Display them in a dialog box. */ |
| 912 BLOCK_INPUT; | 912 BLOCK_INPUT; |