[Emacs-diffs] Changes to emacs/src/macmenu.c

[Nick Roberts]

Index: emacs/src/macmenu.c
diff -c emacs/src/macmenu.c:1.24 emacs/src/macmenu.c:1.25
*** emacs/src/macmenu.c:1.24    Fri May 13 08:43:00 2005
--- emacs/src/macmenu.c Tue May 24 08:42:23 2005
***************
*** 838,846 ****
  An ITEM may also be just a string--that makes a nonselectable item.
  An ITEM may also be nil--that means to put all preceding items
  on the left of the dialog box and all following items on the right.
! \(By default, approximately half appear on each side.)  */)
!   (position, contents)
!      Lisp_Object position, contents;
  {
    FRAME_PTR f = NULL;
    Lisp_Object window;
--- 838,849 ----
  An ITEM may also be just a string--that makes a nonselectable item.
  An ITEM may also be nil--that means to put all preceding items
  on the left of the dialog box and all following items on the right.
! \(By default, approximately half appear on each side.)
! 
! If HEADER is non-nil, the frame title for the box is "Information",
! otherwise it is "Question". */)
!   (position, contents, header)
!      Lisp_Object position, contents, header;
  {
    FRAME_PTR f = NULL;
    Lisp_Object window;
***************
*** 927,933 ****
  
      /* Display them in a dialog box.  */
      BLOCK_INPUT;
!     selection = mac_dialog_show (f, 0, title, &error_name);
      UNBLOCK_INPUT;
  
      discard_menu_items ();
--- 930,936 ----
  
      /* Display them in a dialog box.  */
      BLOCK_INPUT;
!     selection = mac_dialog_show (f, 0, title, header, &error_name);
      UNBLOCK_INPUT;
  
      discard_menu_items ();
***************
*** 2046,2055 ****
    "button6", "button7", "button8", "button9", "button10" };
  
  static Lisp_Object
! mac_dialog_show (f, keymaps, title, error)
       FRAME_PTR f;
       int keymaps;
!      Lisp_Object title;
       char **error;
  {
    int i, nb_buttons=0;
--- 2049,2058 ----
    "button6", "button7", "button8", "button9", "button10" };
  
  static Lisp_Object
! mac_dialog_show (f, keymaps, title, header, error)
       FRAME_PTR f;
       int keymaps;
!      Lisp_Object title, header;
       char **error;
  {
    int i, nb_buttons=0;
***************
*** 2152,2162 ****
      wv->name = dialog_name;
      wv->help = Qnil;
  
      /* Dialog boxes use a really stupid name encoding
         which specifies how many buttons to use
!        and how many buttons are on the right.
!        The Q means something also.  */
!     dialog_name[0] = 'Q';
      dialog_name[1] = '0' + nb_buttons;
      dialog_name[2] = 'B';
      dialog_name[3] = 'R';
--- 2155,2171 ----
      wv->name = dialog_name;
      wv->help = Qnil;
  
+     /*  Frame title: 'Q' = Question, 'I' = Information.
+         Can also have 'E' = Error if, one day, we want
+         a popup for errors. */
+     if (NILP(header))
+       dialog_name[0] = 'Q';
+     else
+       dialog_name[0] = 'I';
+ 
      /* Dialog boxes use a really stupid name encoding
         which specifies how many buttons to use
!        and how many buttons are on the right. */
      dialog_name[1] = '0' + nb_buttons;
      dialog_name[2] = 'B';
      dialog_name[3] = 'R';