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

Diff of /emacs/src/w32menu.c

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

revision 1.41 by monnier, Tue Oct 30 03:38:24 2001 UTC revision 1.42 by pj, Fri Nov 2 20:35:06 2001 UTC
# Line 548  list_of_panes (menu) Line 548  list_of_panes (menu)
548        Lisp_Object elt, pane_name, pane_data;        Lisp_Object elt, pane_name, pane_data;
549        elt = Fcar (tail);        elt = Fcar (tail);
550        pane_name = Fcar (elt);        pane_name = Fcar (elt);
551        CHECK_STRING (pane_name, 0);        CHECK_STRING (pane_name);
552        push_menu_pane (pane_name, Qnil);        push_menu_pane (pane_name, Qnil);
553        pane_data = Fcdr (elt);        pane_data = Fcdr (elt);
554        CHECK_CONS (pane_data, 0);        CHECK_CONS (pane_data);
555        list_of_items (pane_data);        list_of_items (pane_data);
556      }      }
557    
# Line 575  list_of_items (pane) Line 575  list_of_items (pane)
575          push_left_right_boundary ();          push_left_right_boundary ();
576        else        else
577          {          {
578            CHECK_CONS (item, 0);            CHECK_CONS (item);
579            item1 = Fcar (item);            item1 = Fcar (item);
580            CHECK_STRING (item1, 1);            CHECK_STRING (item1);
581            push_menu_item (item1, Qt, Fcdr (item), Qt, Qnil, Qnil, Qnil, Qnil);            push_menu_item (item1, Qt, Fcdr (item), Qt, Qnil, Qnil, Qnil, Qnil);
582          }          }
583      }      }
# Line 678  cached information about equivalent key Line 678  cached information about equivalent key
678              }              }
679          }          }
680    
681        CHECK_NUMBER (x, 0);        CHECK_NUMBER (x);
682        CHECK_NUMBER (y, 0);        CHECK_NUMBER (y);
683    
684        /* Decode where to put the menu.  */        /* Decode where to put the menu.  */
685    
# Line 691  cached information about equivalent key Line 691  cached information about equivalent key
691          }          }
692        else if (WINDOWP (window))        else if (WINDOWP (window))
693          {          {
694            CHECK_LIVE_WINDOW (window, 0);            CHECK_LIVE_WINDOW (window);
695            f = XFRAME (WINDOW_FRAME (XWINDOW (window)));            f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
696    
697            xpos = (FONT_WIDTH (FRAME_FONT (f))            xpos = (FONT_WIDTH (FRAME_FONT (f))
# Line 702  cached information about equivalent key Line 702  cached information about equivalent key
702        else        else
703          /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,          /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
704             but I don't want to make one now.  */             but I don't want to make one now.  */
705          CHECK_WINDOW (window, 0);          CHECK_WINDOW (window);
706    
707        xpos += XINT (x);        xpos += XINT (x);
708        ypos += XINT (y);        ypos += XINT (y);
# Line 774  cached information about equivalent key Line 774  cached information about equivalent key
774      {      {
775        /* We were given an old-fashioned menu.  */        /* We were given an old-fashioned menu.  */
776        title = Fcar (menu);        title = Fcar (menu);
777        CHECK_STRING (title, 1);        CHECK_STRING (title);
778    
779        list_of_panes (Fcdr (menu));        list_of_panes (Fcdr (menu));
780    
# Line 875  on the left of the dialog box and all fo Line 875  on the left of the dialog box and all fo
875      f = XFRAME (window);      f = XFRAME (window);
876    else if (WINDOWP (window))    else if (WINDOWP (window))
877      {      {
878        CHECK_LIVE_WINDOW (window, 0);        CHECK_LIVE_WINDOW (window);
879        f = XFRAME (WINDOW_FRAME (XWINDOW (window)));        f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
880      }      }
881    else    else
882      /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,      /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
883         but I don't want to make one now.  */         but I don't want to make one now.  */
884      CHECK_WINDOW (window, 0);      CHECK_WINDOW (window);
885    
886  #ifndef HAVE_DIALOGS  #ifndef HAVE_DIALOGS
887    /* Display a menu with these alternatives    /* Display a menu with these alternatives
# Line 904  on the left of the dialog box and all fo Line 904  on the left of the dialog box and all fo
904    
905      /* Decode the dialog items from what was specified.  */      /* Decode the dialog items from what was specified.  */
906      title = Fcar (contents);      title = Fcar (contents);
907      CHECK_STRING (title, 1);      CHECK_STRING (title);
908    
909      list_of_panes (Fcons (contents, Qnil));      list_of_panes (Fcons (contents, Qnil));
910    

Legend:
Removed from v.1.41  
changed lines
  Added in v.1.42

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