/[emacs]/emacs/src/xmenu.c
ViewVC logotype

Diff of /emacs/src/xmenu.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.223 by monnier, Tue Oct 30 03:44:08 2001 UTC revision 1.224 by pj, Fri Nov 2 20:38:42 2001 UTC
# Line 619  list_of_panes (menu) Line 619  list_of_panes (menu)
619        Lisp_Object elt, pane_name, pane_data;        Lisp_Object elt, pane_name, pane_data;
620        elt = Fcar (tail);        elt = Fcar (tail);
621        pane_name = Fcar (elt);        pane_name = Fcar (elt);
622        CHECK_STRING (pane_name, 0);        CHECK_STRING (pane_name);
623        push_menu_pane (pane_name, Qnil);        push_menu_pane (pane_name, Qnil);
624        pane_data = Fcdr (elt);        pane_data = Fcdr (elt);
625        CHECK_CONS (pane_data, 0);        CHECK_CONS (pane_data);
626        list_of_items (pane_data);        list_of_items (pane_data);
627      }      }
628    
# Line 646  list_of_items (pane) Line 646  list_of_items (pane)
646          push_left_right_boundary ();          push_left_right_boundary ();
647        else        else
648          {          {
649            CHECK_CONS (item, 0);            CHECK_CONS (item);
650            item1 = Fcar (item);            item1 = Fcar (item);
651            CHECK_STRING (item1, 1);            CHECK_STRING (item1);
652            push_menu_item (item1, Qt, Fcdr (item), Qt, Qnil, Qnil, Qnil, Qnil);            push_menu_item (item1, Qt, Fcdr (item), Qt, Qnil, Qnil, Qnil, Qnil);
653          }          }
654      }      }
# Line 750  cached information about equivalent key Line 750  cached information about equivalent key
750              }              }
751          }          }
752    
753        CHECK_NUMBER (x, 0);        CHECK_NUMBER (x);
754        CHECK_NUMBER (y, 0);        CHECK_NUMBER (y);
755    
756        /* Decode where to put the menu.  */        /* Decode where to put the menu.  */
757    
# Line 763  cached information about equivalent key Line 763  cached information about equivalent key
763          }          }
764        else if (WINDOWP (window))        else if (WINDOWP (window))
765          {          {
766            CHECK_LIVE_WINDOW (window, 0);            CHECK_LIVE_WINDOW (window);
767            f = XFRAME (WINDOW_FRAME (XWINDOW (window)));            f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
768    
769            xpos = (FONT_WIDTH (FRAME_FONT (f))            xpos = (FONT_WIDTH (FRAME_FONT (f))
# Line 774  cached information about equivalent key Line 774  cached information about equivalent key
774        else        else
775          /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,          /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
776             but I don't want to make one now.  */             but I don't want to make one now.  */
777          CHECK_WINDOW (window, 0);          CHECK_WINDOW (window);
778    
779        xpos += XINT (x);        xpos += XINT (x);
780        ypos += XINT (y);        ypos += XINT (y);
# Line 846  cached information about equivalent key Line 846  cached information about equivalent key
846      {      {
847        /* We were given an old-fashioned menu.  */        /* We were given an old-fashioned menu.  */
848        title = Fcar (menu);        title = Fcar (menu);
849        CHECK_STRING (title, 1);        CHECK_STRING (title);
850    
851        list_of_panes (Fcdr (menu));        list_of_panes (Fcdr (menu));
852    
# Line 948  on the left of the dialog box and all fo Line 948  on the left of the dialog box and all fo
948      f = XFRAME (window);      f = XFRAME (window);
949    else if (WINDOWP (window))    else if (WINDOWP (window))
950      {      {
951        CHECK_LIVE_WINDOW (window, 0);        CHECK_LIVE_WINDOW (window);
952        f = XFRAME (WINDOW_FRAME (XWINDOW (window)));        f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
953      }      }
954    else    else
955      /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,      /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
956         but I don't want to make one now.  */         but I don't want to make one now.  */
957      CHECK_WINDOW (window, 0);      CHECK_WINDOW (window);
958    
959  #ifndef USE_X_TOOLKIT  #ifndef USE_X_TOOLKIT
960    /* Display a menu with these alternatives    /* Display a menu with these alternatives
# Line 977  on the left of the dialog box and all fo Line 977  on the left of the dialog box and all fo
977    
978      /* Decode the dialog items from what was specified.  */      /* Decode the dialog items from what was specified.  */
979      title = Fcar (contents);      title = Fcar (contents);
980      CHECK_STRING (title, 1);      CHECK_STRING (title);
981    
982      list_of_panes (Fcons (contents, Qnil));      list_of_panes (Fcons (contents, Qnil));
983    

Legend:
Removed from v.1.223  
changed lines
  Added in v.1.224

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26