comparison src/xmenu.c @ 6481:55236c5bca7c

(update_frame_menubar): Function renamed from update_one_frame_psheets. (initialize_frame_menubar): New function. (set_frame_menubar): Call menu_bar_items when items is NIL.

6480:c6cafb1168b3

}

extern void EmacsFrameSetCharSize ();

static void
update_one_frame_psheets (f)
     FRAME_PTR f;
{
  struct x_display *x = f->display.x;
  int columns, rows;
  int menubar_changed;

  wv->name = "menubar";
  wv->value = 0;
  wv->enabled = 1;
  save_wv = first_wv = wv;

  items = FRAME_MENU_BAR_ITEMS (f);

  for (i = 0; i < XVECTOR (items)->size; i += 3)
    {
      Lisp_Object string;

		     0);
    }
  
  free_menubar_widget_value_tree (first_wv);

  update_one_frame_psheets (f);

  UNBLOCK_INPUT;
}

void

    {
      BLOCK_INPUT;
      lw_destroy_all_widgets (id);
      UNBLOCK_INPUT;
    }
}

/* Nonzero if position X, Y relative to inside of frame F
   is in some other menu bar item.  */

6481:55236c5bca7c

}

extern void EmacsFrameSetCharSize ();

static void
update_frame_menubar (f)
     FRAME_PTR f;
{
  struct x_display *x = f->display.x;
  int columns, rows;
  int menubar_changed;

  wv->name = "menubar";
  wv->value = 0;
  wv->enabled = 1;
  save_wv = first_wv = wv;

  if (NILP (items = FRAME_MENU_BAR_ITEMS (f)))
    items = FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));

  for (i = 0; i < XVECTOR (items)->size; i += 3)
    {
      Lisp_Object string;

		     0);
    }
  
  free_menubar_widget_value_tree (first_wv);

  update_frame_menubar (f);

  UNBLOCK_INPUT;
}

void

    {
      BLOCK_INPUT;
      lw_destroy_all_widgets (id);
      UNBLOCK_INPUT;
    }
}
/* Called from Fx_create_frame to create the inital menubar of a frame
   before it is mapped, so that the window is mapped with the menubar already
   there instead of us tacking it on later and thrashing the window after it
   is visible.  */
void
initialize_frame_menubar (f)
     FRAME_PTR f;
{
  set_frame_menubar (f);
}

/* Nonzero if position X, Y relative to inside of frame F
   is in some other menu bar item.  */