comparison src/xmenu.c @ 26036:b89acbeca64b

(set_frame_menubar): Don't call x_set_menu_resources_from_menu_face here. (update_frame_menubar): Call x_set_menu_resources_from_menu_face.

26035:19ea0123f19d

      XtVaSetValues (x->menubar_widget, XtNmappedWhenManaged, 1, 0);
    }

  /* Re-manage the text-area widget, and then thrash the sizes.  */
  XtManageChild (x->edit_widget);
  lw_refigure_widget (x->column_widget, True);

  /* Force the pane widget to resize itself with the right values.  */
  EmacsFrameSetCharSize (x->edit_widget, columns, rows);
  UNBLOCK_INPUT;

#endif /* 0 */

    f->output_data.x->menubar_height = menubar_size;
  }
  
  x_set_menu_resources_from_menu_face (f, f->output_data.x->menubar_widget);
  free_menubar_widget_value_tree (first_wv);
  update_frame_menubar (f);

  UNBLOCK_INPUT;
}

26036:b89acbeca64b

      XtVaSetValues (x->menubar_widget, XtNmappedWhenManaged, 1, 0);
    }

  /* Re-manage the text-area widget, and then thrash the sizes.  */
  XtManageChild (x->edit_widget);
  x_set_menu_resources_from_menu_face (f, x->menubar_widget);
  lw_refigure_widget (x->column_widget, True);

  /* Force the pane widget to resize itself with the right values.  */
  EmacsFrameSetCharSize (x->edit_widget, columns, rows);
  UNBLOCK_INPUT;

#endif /* 0 */

    f->output_data.x->menubar_height = menubar_size;
  }
  
  free_menubar_widget_value_tree (first_wv);
  update_frame_menubar (f);

  UNBLOCK_INPUT;
}