Commit 9ea173e8 authored by Gerd Moellmann's avatar Gerd Moellmann

Change spelling of `toolbar' to `tool_bar' or `tool-bar'.

Likewise for upper-case etc.
parent e037b9ec
......@@ -2247,14 +2247,14 @@ mark_object (argptr)
mark_object (&ptr->buffer_predicate);
mark_object (&ptr->buffer_list);
mark_object (&ptr->menu_bar_window);
mark_object (&ptr->toolbar_window);
mark_object (&ptr->tool_bar_window);
mark_face_cache (ptr->face_cache);
#ifdef HAVE_WINDOW_SYSTEM
mark_image_cache (ptr);
mark_object (&ptr->desired_toolbar_items);
mark_object (&ptr->current_toolbar_items);
mark_object (&ptr->desired_toolbar_string);
mark_object (&ptr->current_toolbar_string);
mark_object (&ptr->desired_tool_bar_items);
mark_object (&ptr->current_tool_bar_items);
mark_object (&ptr->desired_tool_bar_string);
mark_object (&ptr->current_tool_bar_string);
#endif /* HAVE_WINDOW_SYSTEM */
}
else if (GC_BOOL_VECTOR_P (obj))
......
......@@ -1264,7 +1264,7 @@ enum face_id
{
DEFAULT_FACE_ID,
MODE_LINE_FACE_ID,
TOOLBAR_FACE_ID,
TOOL_BAR_FACE_ID,
BITMAP_AREA_FACE_ID,
TOP_LINE_FACE_ID,
BASIC_FACE_ID_SENTINEL
......@@ -1581,7 +1581,7 @@ struct it
unsigned overlay_strings_at_end_processed_p : 1;
/* The ID of the default face to use. One of DEFAULT_FACE_ID,
MODE_LINE_FACE_ID, or TOOLBAR_FACE_ID, depending on what we
MODE_LINE_FACE_ID, or TOOL_BAR_FACE_ID, depending on what we
are displaying. */
int base_face_id;
......@@ -1961,69 +1961,69 @@ struct image_cache
/***********************************************************************
Toolbars
Tool-bars
***********************************************************************/
/* Enumeration defining where to find toolbar item information in
toolbar items vectors stored with frames. Each toolbar item
occupies TOOLBAR_ITEM_NSLOTS elements in such a vector. */
/* Enumeration defining where to find tool-bar item information in
tool-bar items vectors stored with frames. Each tool-bar item
occupies TOOL_BAR_ITEM_NSLOTS elements in such a vector. */
enum toolbar_item_idx
enum tool_bar_item_idx
{
/* The key of the toolbar item. Used to remove items when a binding
/* The key of the tool-bar item. Used to remove items when a binding
for `undefined' is found. */
TOOLBAR_ITEM_KEY,
TOOL_BAR_ITEM_KEY,
/* Non-nil if item is enabled. */
TOOLBAR_ITEM_ENABLED_P,
TOOL_BAR_ITEM_ENABLED_P,
/* Non-nil if item is selected (pressed). */
TOOLBAR_ITEM_SELECTED_P,
TOOL_BAR_ITEM_SELECTED_P,
/* Caption. */
TOOLBAR_ITEM_CAPTION,
TOOL_BAR_ITEM_CAPTION,
/* Image(s) to display. This is either a single image specification
or a vector of specifications. */
TOOLBAR_ITEM_IMAGES,
TOOL_BAR_ITEM_IMAGES,
/* The binding. */
TOOLBAR_ITEM_BINDING,
TOOL_BAR_ITEM_BINDING,
/* Button type. One of nil, `:radio' or `:toggle'. */
TOOLBAR_ITEM_TYPE,
TOOL_BAR_ITEM_TYPE,
/* Help string. */
TOOLBAR_ITEM_HELP,
TOOL_BAR_ITEM_HELP,
/* Sentinel = number of slots in toolbar_items occupied by one
toolbar item. */
TOOLBAR_ITEM_NSLOTS
/* Sentinel = number of slots in tool_bar_items occupied by one
tool-bar item. */
TOOL_BAR_ITEM_NSLOTS
};
/* An enumeration for the different images that can be specified
for a toolbar item. */
for a tool-bar item. */
enum toolbar_item_image
enum tool_bar_item_image
{
TOOLBAR_IMAGE_ENABLED_SELECTED,
TOOLBAR_IMAGE_ENABLED_DESELECTED,
TOOLBAR_IMAGE_DISABLED_SELECTED,
TOOLBAR_IMAGE_DISABLED_DESELECTED
TOOL_BAR_IMAGE_ENABLED_SELECTED,
TOOL_BAR_IMAGE_ENABLED_DESELECTED,
TOOL_BAR_IMAGE_DISABLED_SELECTED,
TOOL_BAR_IMAGE_DISABLED_DESELECTED
};
/* Non-zero means raise toolbar buttons when the mouse moves over them. */
/* Non-zero means raise tool-bar buttons when the mouse moves over them. */
extern int auto_raise_toolbar_buttons_p;
extern int auto_raise_tool_bar_buttons_p;
/* Margin around toolbar buttons in pixels. */
/* Margin around tool-bar buttons in pixels. */
extern int toolbar_button_margin;
extern int tool_bar_button_margin;
/* Thickness of relief to draw around toolbar buttons. */
/* Thickness of relief to draw around tool-bar buttons. */
extern int toolbar_button_relief;
extern int tool_bar_button_relief;
......@@ -2060,8 +2060,8 @@ void move_it_vertically P_ ((struct it *, int));
void move_it_by_lines P_ ((struct it *, int, int));
int frame_mode_line_height P_ ((struct frame *));
void highlight_trailing_whitespace P_ ((struct frame *, struct glyph_row *));
int toolbar_item_info P_ ((struct frame *, struct glyph *, int *));
extern Lisp_Object Qtoolbar;
int tool_bar_item_info P_ ((struct frame *, struct glyph *, int *));
extern Lisp_Object Qtool_bar;
extern Lisp_Object Vshow_trailing_whitespace;
extern int redisplaying_p;
......
......@@ -885,9 +885,9 @@ clear_current_matrices (f)
if (WINDOWP (f->menu_bar_window))
clear_glyph_matrix (XWINDOW (f->menu_bar_window)->current_matrix);
/* Clear the matrix of the toolbar window, if any. */
if (WINDOWP (f->toolbar_window))
clear_glyph_matrix (XWINDOW (f->toolbar_window)->current_matrix);
/* Clear the matrix of the tool-bar window, if any. */
if (WINDOWP (f->tool_bar_window))
clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix);
/* Clear current window matrices. */
xassert (WINDOWP (FRAME_ROOT_WINDOW (f)));
......@@ -907,8 +907,8 @@ clear_desired_matrices (f)
if (WINDOWP (f->menu_bar_window))
clear_glyph_matrix (XWINDOW (f->menu_bar_window)->desired_matrix);
if (WINDOWP (f->toolbar_window))
clear_glyph_matrix (XWINDOW (f->toolbar_window)->desired_matrix);
if (WINDOWP (f->tool_bar_window))
clear_glyph_matrix (XWINDOW (f->tool_bar_window)->desired_matrix);
/* Do it for window matrices. */
xassert (WINDOWP (FRAME_ROOT_WINDOW (f)));
......@@ -2076,21 +2076,21 @@ adjust_frame_glyphs_for_window_redisplay (f)
}
#endif /* not USE_X_TOOLKIT */
/* Allocate/ reallocate matrices of the toolbar window. If we don't
have a toolbar window yet, make one. */
if (NILP (f->toolbar_window))
/* Allocate/ reallocate matrices of the tool bar window. If we
don't have a tool bar window yet, make one. */
if (NILP (f->tool_bar_window))
{
f->toolbar_window = make_window ();
w = XWINDOW (f->toolbar_window);
f->tool_bar_window = make_window ();
w = XWINDOW (f->tool_bar_window);
XSETFRAME (w->frame, f);
w->pseudo_window_p = 1;
}
else
w = XWINDOW (f->toolbar_window);
w = XWINDOW (f->tool_bar_window);
XSETFASTINT (w->top, FRAME_MENU_BAR_LINES (f));
XSETFASTINT (w->left, 0);
XSETFASTINT (w->height, FRAME_TOOLBAR_LINES (f));
XSETFASTINT (w->height, FRAME_TOOL_BAR_LINES (f));
XSETFASTINT (w->width, FRAME_WINDOW_WIDTH (f));
allocate_matrices_for_window_redisplay (w, ch_dim);
}
......@@ -2167,14 +2167,14 @@ free_glyphs (f)
f->menu_bar_window = Qnil;
}
/* Free the toolbar window and its glyph matrices. */
if (!NILP (f->toolbar_window))
/* Free the tool bar window and its glyph matrices. */
if (!NILP (f->tool_bar_window))
{
struct window *w = XWINDOW (f->toolbar_window);
struct window *w = XWINDOW (f->tool_bar_window);
free_glyph_matrix (w->desired_matrix);
free_glyph_matrix (w->current_matrix);
w->desired_matrix = w->current_matrix = NULL;
f->toolbar_window = Qnil;
f->tool_bar_window = Qnil;
}
/* Release frame glyph matrices. Reset fields to zero in
......@@ -3352,10 +3352,10 @@ update_frame (f, force_p, inhibit_hairy_id_p)
update_window (XWINDOW (f->menu_bar_window), 1);
/* Update the tool-bar window, if present. */
if (WINDOWP (f->toolbar_window))
if (WINDOWP (f->tool_bar_window))
{
Lisp_Object tem;
struct window *w = XWINDOW (f->toolbar_window);
struct window *w = XWINDOW (f->tool_bar_window);
/* Update tool-bar window. */
if (w->must_be_updated_p)
......@@ -3365,16 +3365,16 @@ update_frame (f, force_p, inhibit_hairy_id_p)
/* Swap tool-bar strings. We swap because we want to
reuse strings. */
tem = f->current_toolbar_string;
f->current_toolbar_string = f->desired_toolbar_string;
f->desired_toolbar_string = tem;
f->n_current_toolbar_items = f->n_desired_toolbar_items;
tem = f->current_tool_bar_string;
f->current_tool_bar_string = f->desired_tool_bar_string;
f->desired_tool_bar_string = tem;
f->n_current_tool_bar_items = f->n_desired_tool_bar_items;
/* Swap tool-bar items. We swap because we want to
reuse vectors. */
tem = f->current_toolbar_items;
f->current_toolbar_items = f->desired_toolbar_items;
f->desired_toolbar_items = tem;
tem = f->current_tool_bar_items;
f->current_tool_bar_items = f->desired_tool_bar_items;
f->desired_tool_bar_items = tem;
}
}
......@@ -5336,8 +5336,8 @@ change_frame_size_1 (f, newheight, newwidth, pretend, delay, safe)
if (FRAME_TERMCAP_P (f) && !pretend)
FrameCols = newwidth;
if (WINDOWP (f->toolbar_window))
XSETFASTINT (XWINDOW (f->toolbar_window)->width, newwidth);
if (WINDOWP (f->tool_bar_window))
XSETFASTINT (XWINDOW (f->tool_bar_window)->width, newwidth);
}
FRAME_HEIGHT (f) = newheight;
......
......@@ -90,7 +90,7 @@ Lisp_Object Qname;
Lisp_Object Qonly;
Lisp_Object Qunsplittable;
Lisp_Object Qmenu_bar_lines;
Lisp_Object Qtoolbar_lines;
Lisp_Object Qtool_bar_lines;
Lisp_Object Qwidth;
Lisp_Object Qx;
Lisp_Object Qw32;
......@@ -128,8 +128,8 @@ syms_of_frame_1 ()
staticpro (&Qunsplittable);
Qmenu_bar_lines = intern ("menu-bar-lines");
staticpro (&Qmenu_bar_lines);
Qtoolbar_lines = intern ("toolbar-lines");
staticpro (&Qtoolbar_lines);
Qtool_bar_lines = intern ("tool-bar-lines");
staticpro (&Qtool_bar_lines);
Qwidth = intern ("width");
staticpro (&Qwidth);
Qx = intern ("x");
......@@ -329,10 +329,10 @@ make_frame (mini_p)
f->namebuf = 0;
f->title = Qnil;
f->menu_bar_window = Qnil;
f->toolbar_window = Qnil;
f->desired_toolbar_items = f->current_toolbar_items = Qnil;
f->desired_toolbar_string = f->current_toolbar_string = Qnil;
f->n_desired_toolbar_items = f->n_current_toolbar_items = 0;
f->tool_bar_window = Qnil;
f->desired_tool_bar_items = f->current_tool_bar_items = Qnil;
f->desired_tool_bar_string = f->current_tool_bar_string = Qnil;
f->n_desired_tool_bar_items = f->n_current_tool_bar_items = 0;
root_window = make_window ();
if (mini_p)
......
......@@ -148,14 +148,14 @@ struct frame
toolkit support is available. */
Lisp_Object menu_bar_window;
/* A window used to display the toolbar of a frame. */
Lisp_Object toolbar_window;
/* A window used to display the tool-bar of a frame. */
Lisp_Object tool_bar_window;
/* Desired and current toolbar items. */
Lisp_Object desired_toolbar_items, current_toolbar_items;
/* Desired and current tool-bar items. */
Lisp_Object desired_tool_bar_items, current_tool_bar_items;
/* Desired and current contents displayed in toolbar_window. */
Lisp_Object desired_toolbar_string, current_toolbar_string;
/* Desired and current contents displayed in tool_bar_window. */
Lisp_Object desired_tool_bar_string, current_tool_bar_string;
/* beyond here, there should be no more Lisp_Object components. */
......@@ -176,11 +176,11 @@ struct frame
be used for output. */
unsigned glyphs_initialized_p : 1;
/* Margin at the top of the frame. Used to display the toolbar. */
int toolbar_lines;
/* Margin at the top of the frame. Used to display the tool-bar. */
int tool_bar_lines;
int n_desired_toolbar_items;
int n_current_toolbar_items;
int n_desired_tool_bar_items;
int n_current_tool_bar_items;
/* A buffer for decode_mode_line. */
char *decode_mode_spec_buffer;
......@@ -412,14 +412,14 @@ typedef struct frame *FRAME_PTR;
These lines are counted in FRAME_HEIGHT. */
#define FRAME_MENU_BAR_LINES(f) (f)->menu_bar_lines
/* Number of lines of frame F used for the toolbar. */
/* Number of lines of frame F used for the tool-bar. */
#define FRAME_TOOLBAR_LINES(f) (f)->toolbar_lines
#define FRAME_TOOL_BAR_LINES(f) (f)->tool_bar_lines
/* Lines above the top-most window in frame F. */
#define FRAME_TOP_MARGIN(F) \
(FRAME_MENU_BAR_LINES (F) + FRAME_TOOLBAR_LINES (F))
(FRAME_MENU_BAR_LINES (F) + FRAME_TOOL_BAR_LINES (F))
/* Nonzero if this frame should display a menu bar
in a way that does not use any text lines. */
......
This diff is collapsed.
......@@ -2357,7 +2357,7 @@ EXFUN (Frecursive_edit, 0);
EXFUN (Fcommand_execute, 4);
EXFUN (Finput_pending_p, 0);
extern Lisp_Object menu_bar_items P_ ((Lisp_Object));
extern Lisp_Object toolbar_items P_ ((Lisp_Object, int *));
extern Lisp_Object tool_bar_items P_ ((Lisp_Object, int *));
extern Lisp_Object Qvertical_scroll_bar;
extern void discard_mouse_events ();
EXFUN (Fevent_convert_list, 1);
......@@ -2639,7 +2639,7 @@ extern void syms_of_xfaces P_ ((void));
#ifdef HAVE_X_WINDOWS
/* Defined in xfns.c */
extern void x_set_toolbar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
extern void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
extern void syms_of_xfns P_ ((void));
#endif
......
......@@ -307,13 +307,13 @@ enum event_kind
.code is a number identifying it,
index into lispy_user_signals. */
/* Currently only returned when the mouse enters a toolbar item that
/* Currently only returned when the mouse enters a tool-bar item that
has a help string. Member frame_or_window of the input_event is
a cons cell whose car is the toolbar's frame and whose cdr is the
a cons cell whose car is the tool-bar's frame and whose cdr is the
help string. */
HELP_EVENT,
TOOLBAR_EVENT
TOOL_BAR_EVENT
};
/* If a struct input_event has a kind which is selection_request_event
......
......@@ -581,14 +581,14 @@ If they are on the border between WINDOW and its right sibling,\n\
set *PART to 1; if it is on the separating line between the window
and its right sibling, set it to 2; otherwise set it to 0. If
there is no window under X, Y return nil and leave *PART
unmodified. TOOLBAR_P non-zero means detect toolbar windows. */
unmodified. TOOL_BAR_P non-zero means detect tool-bar windows. */
Lisp_Object
window_from_coordinates (frame, x, y, part, toolbar_p)
window_from_coordinates (frame, x, y, part, tool_bar_p)
FRAME_PTR frame;
int x, y;
int *part;
int toolbar_p;
int tool_bar_p;
{
register Lisp_Object tem, first;
int found;
......@@ -609,14 +609,14 @@ window_from_coordinates (frame, x, y, part, toolbar_p)
}
while (!EQ (tem, first));
/* See if it's in the toolbar window, if a toolbar exists. */
if (toolbar_p
&& WINDOWP (frame->toolbar_window)
&& XFASTINT (XWINDOW (frame->toolbar_window)->height)
&& coordinates_in_window (XWINDOW (frame->toolbar_window), &x, &y))
/* See if it's in the tool bar window, if a tool bar exists. */
if (tool_bar_p
&& WINDOWP (frame->tool_bar_window)
&& XFASTINT (XWINDOW (frame->tool_bar_window)->height)
&& coordinates_in_window (XWINDOW (frame->tool_bar_window), &x, &y))
{
*part = 0;
return frame->toolbar_window;
return frame->tool_bar_window;
}
return Qnil;
......@@ -3976,7 +3976,7 @@ struct save_window_data
EMACS_INT size_from_Lisp_Vector_struct;
struct Lisp_Vector *next_from_Lisp_Vector_struct;
Lisp_Object frame_width, frame_height, frame_menu_bar_lines;
Lisp_Object frame_toolbar_lines;
Lisp_Object frame_tool_bar_lines;
Lisp_Object selected_frame;
Lisp_Object current_window;
Lisp_Object current_buffer;
......@@ -4091,7 +4091,7 @@ the return value is nil. Otherwise the value is t.")
int previous_frame_height = FRAME_HEIGHT (f);
int previous_frame_width = FRAME_WIDTH (f);
int previous_frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f);
int previous_frame_toolbar_lines = FRAME_TOOLBAR_LINES (f);
int previous_frame_tool_bar_lines = FRAME_TOOL_BAR_LINES (f);
/* The mouse highlighting code could get screwed up
if it runs during this. */
......@@ -4106,9 +4106,9 @@ the return value is nil. Otherwise the value is t.")
!= previous_frame_menu_bar_lines)
x_set_menu_bar_lines (f, data->frame_menu_bar_lines, make_number (0));
#ifdef HAVE_WINDOW_SYSTEM
if (XFASTINT (data->frame_toolbar_lines)
!= previous_frame_toolbar_lines)
x_set_toolbar_lines (f, data->frame_toolbar_lines, make_number (0));
if (XFASTINT (data->frame_tool_bar_lines)
!= previous_frame_tool_bar_lines)
x_set_tool_bar_lines (f, data->frame_tool_bar_lines, make_number (0));
#endif
#endif
......@@ -4273,9 +4273,9 @@ the return value is nil. Otherwise the value is t.")
x_set_menu_bar_lines (f, make_number (previous_frame_menu_bar_lines),
make_number (0));
#ifdef HAVE_WINDOW_SYSTEM
if (previous_frame_toolbar_lines != FRAME_TOOLBAR_LINES (f))
x_set_toolbar_lines (f, make_number (previous_frame_toolbar_lines),
make_number (0));
if (previous_frame_tool_bar_lines != FRAME_TOOL_BAR_LINES (f))
x_set_tool_bar_lines (f, make_number (previous_frame_tool_bar_lines),
make_number (0));
#endif
#endif
......@@ -4529,7 +4529,7 @@ redirection (see `redirect-frame-focus').")
XSETFASTINT (data->frame_width, FRAME_WIDTH (f));
XSETFASTINT (data->frame_height, FRAME_HEIGHT (f));
XSETFASTINT (data->frame_menu_bar_lines, FRAME_MENU_BAR_LINES (f));
XSETFASTINT (data->frame_toolbar_lines, FRAME_TOOLBAR_LINES (f));
XSETFASTINT (data->frame_tool_bar_lines, FRAME_TOOL_BAR_LINES (f));
XSETFRAME (data->selected_frame, selected_frame);
data->current_window = FRAME_SELECTED_WINDOW (f);
XSETBUFFER (data->current_buffer, current_buffer);
......
......@@ -280,7 +280,7 @@ Lisp_Object Qx_charset_registry;
/* Names of basic faces. */
Lisp_Object Qdefault, Qmodeline, Qtoolbar, Qregion, Qmargin;
Lisp_Object Qdefault, Qmodeline, Qtool_bar, Qregion, Qmargin;
Lisp_Object Qtop_line;
/* Default stipple pattern used on monochrome displays. This stipple
......@@ -5130,7 +5130,7 @@ realize_basic_faces (f)
if (realize_default_face (f))
{
realize_named_face (f, Qmodeline, MODE_LINE_FACE_ID);
realize_named_face (f, Qtoolbar, TOOLBAR_FACE_ID);
realize_named_face (f, Qtool_bar, TOOL_BAR_FACE_ID);
realize_named_face (f, Qmargin, BITMAP_AREA_FACE_ID);
realize_named_face (f, Qtop_line, TOP_LINE_FACE_ID);
success_p = 1;
......@@ -6242,8 +6242,8 @@ syms_of_xfaces ()
staticpro (&Qdefault);
Qmodeline = intern ("modeline");
staticpro (&Qmodeline);
Qtoolbar = intern ("toolbar");
staticpro (&Qtoolbar);
Qtool_bar = intern ("tool-bar");
staticpro (&Qtool_bar);
Qregion = intern ("region");
staticpro (&Qregion);
Qmargin = intern ("margin");
......
......@@ -20,7 +20,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
/* Image support (XBM, XPM, PBM, JPEG, TIFF, GIF, PNG, GS). tooltips,
toolbars, busy-cursor, file selection dialog added by Gerd
tool-bars, busy-cursor, file selection dialog added by Gerd
Moellmann <gerd@gnu.org>. */
/* Completely rewritten by Richard Stallman. */
......@@ -259,7 +259,7 @@ Lisp_Object Qscreen_gamma;
extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth;
extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle;
extern Lisp_Object Qtoolbar_lines;
extern Lisp_Object Qtool_bar_lines;
extern Lisp_Object Vwindow_system_version;
......@@ -769,7 +769,7 @@ void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_scroll_bar_width P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_title P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_unsplittable P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_toolbar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
void x_set_scroll_bar_foreground P_ ((struct frame *, Lisp_Object,
Lisp_Object));
void x_set_scroll_bar_background P_ ((struct frame *, Lisp_Object,
......@@ -803,7 +803,7 @@ static struct x_frame_parm_table x_frame_parms[] =
"unsplittable", x_set_unsplittable,
"vertical-scroll-bars", x_set_vertical_scroll_bars,
"visibility", x_set_visibility,
"toolbar-lines", x_set_toolbar_lines,
"tool-bar-lines", x_set_tool_bar_lines,
"scroll-bar-foreground", x_set_scroll_bar_foreground,
"scroll-bar-background", x_set_scroll_bar_background,
"screen-gamma", x_set_screen_gamma
......@@ -1984,7 +1984,7 @@ x_set_menu_bar_lines (f, value, oldval)
The frame's height doesn't change. */
void
x_set_toolbar_lines (f, value, oldval)
x_set_tool_bar_lines (f, value, oldval)
struct frame *f;
Lisp_Object value, oldval;
{
......@@ -1999,8 +1999,8 @@ x_set_toolbar_lines (f, value, oldval)
/* Make sure we redisplay all windows in this frame. */
++windows_or_buffers_changed;
delta = nlines - FRAME_TOOLBAR_LINES (f);
FRAME_TOOLBAR_LINES (f) = nlines;
delta = nlines - FRAME_TOOL_BAR_LINES (f);
FRAME_TOOL_BAR_LINES (f) = nlines;
x_set_menu_bar_lines_1 (FRAME_ROOT_WINDOW (f), delta);
adjust_glyphs (f);
}
......@@ -3773,7 +3773,7 @@ This function is an internal primitive--use `make-frame' instead.")
x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
"menuBar", "MenuBar", RES_TYPE_NUMBER);
x_default_parameter (f, parms, Qtoolbar_lines, make_number (0),
x_default_parameter (f, parms, Qtool_bar_lines, make_number (0),
"toolBar", "ToolBar", RES_TYPE_NUMBER);
x_default_parameter (f, parms, Qscroll_bar_width, Qnil,
"scrollBarWidth", "ScrollBarWidth",
......@@ -3807,13 +3807,13 @@ This function is an internal primitive--use `make-frame' instead.")
tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN);
f->no_split = minibuffer_only || EQ (tem, Qt);
/* Create the X widget or window. Add the toolbar height to the
/* Create the X widget or window. Add the tool-bar height to the
initial frame height so that the user gets a text display area of
the size he specified with -g or via .Xdefaults. Later changes
of the toolbar height don't change the frame size. This is done
of the tool-bar height don't change the frame size. This is done
so that users can create tall Emacs frames without having to
guess how tall the toolbar will get. */
f->height += FRAME_TOOLBAR_LINES (f);
guess how tall the tool-bar will get. */
f->height += FRAME_TOOL_BAR_LINES (f);
#ifdef USE_X_TOOLKIT
x_window (f, window_prompting, minibuffer_only);
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment