\f
static Lisp_Object
-mark_toolbar_button (Lisp_Object obj, void (*markobj) (Lisp_Object))
+mark_toolbar_button (Lisp_Object obj)
{
struct toolbar_button *data = XTOOLBAR_BUTTON (obj);
- markobj (data->next);
- markobj (data->frame);
- markobj (data->up_glyph);
- markobj (data->down_glyph);
- markobj (data->disabled_glyph);
- markobj (data->cap_up_glyph);
- markobj (data->cap_down_glyph);
- markobj (data->cap_disabled_glyph);
- markobj (data->callback);
- markobj (data->enabled_p);
+ mark_object (data->next);
+ mark_object (data->frame);
+ mark_object (data->up_glyph);
+ mark_object (data->down_glyph);
+ mark_object (data->disabled_glyph);
+ mark_object (data->cap_up_glyph);
+ mark_object (data->cap_down_glyph);
+ mark_object (data->cap_disabled_glyph);
+ mark_object (data->callback);
+ mark_object (data->enabled_p);
return data->help_string;
}
DEFINE_LRECORD_IMPLEMENTATION ("toolbar-button", toolbar_button,
mark_toolbar_button, print_toolbar_button,
- 0, 0, 0,
+ 0, 0, 0, 0,
struct toolbar_button);
DEFUN ("toolbar-button-p", Ftoolbar_button_p, 1, 1, 0, /*
if (!tb)
{
- tb = alloc_lcrecord_type (struct toolbar_button, lrecord_toolbar_button);
+ tb = alloc_lcrecord_type (struct toolbar_button, &lrecord_toolbar_button);
tb->next = Qnil;
XSETFRAME (tb->frame, f);
tb->up_glyph = Qnil;
}
void
+reinit_specifier_type_create_toolbar (void)
+{
+ REINITIALIZE_SPECIFIER_TYPE (toolbar);
+}
+
+void
specifier_vars_of_toolbar (void)
{
Lisp_Object fb;
automatically knew about specifier fallbacks, so we didn't
have to do it ourselves. */
set_specifier_caching (Vdefault_toolbar,
- slot_offset (struct window,
- default_toolbar),
+ offsetof (struct window, default_toolbar),
default_toolbar_specs_changed,
0, 0);
*/ );
Vtoolbar[TOP_TOOLBAR] = Fmake_specifier (Qtoolbar);
set_specifier_caching (Vtoolbar[TOP_TOOLBAR],
- slot_offset (struct window,
- toolbar[TOP_TOOLBAR]),
+ offsetof (struct window, toolbar[TOP_TOOLBAR]),
toolbar_specs_changed,
0, 0);
*/ );
Vtoolbar[BOTTOM_TOOLBAR] = Fmake_specifier (Qtoolbar);
set_specifier_caching (Vtoolbar[BOTTOM_TOOLBAR],
- slot_offset (struct window,
- toolbar[BOTTOM_TOOLBAR]),
+ offsetof (struct window, toolbar[BOTTOM_TOOLBAR]),
toolbar_specs_changed,
0, 0);
*/ );
Vtoolbar[LEFT_TOOLBAR] = Fmake_specifier (Qtoolbar);
set_specifier_caching (Vtoolbar[LEFT_TOOLBAR],
- slot_offset (struct window,
- toolbar[LEFT_TOOLBAR]),
+ offsetof (struct window, toolbar[LEFT_TOOLBAR]),
toolbar_specs_changed,
0, 0);
*/ );
Vtoolbar[RIGHT_TOOLBAR] = Fmake_specifier (Qtoolbar);
set_specifier_caching (Vtoolbar[RIGHT_TOOLBAR],
- slot_offset (struct window,
- toolbar[RIGHT_TOOLBAR]),
+ offsetof (struct window, toolbar[RIGHT_TOOLBAR]),
toolbar_specs_changed,
0, 0);
*/ );
Vdefault_toolbar_height = Fmake_specifier (Qnatnum);
set_specifier_caching (Vdefault_toolbar_height,
- slot_offset (struct window,
- default_toolbar_height),
+ offsetof (struct window, default_toolbar_height),
default_toolbar_size_changed_in_window,
- slot_offset (struct frame,
- default_toolbar_height),
+ offsetof (struct frame, default_toolbar_height),
default_toolbar_size_changed_in_frame);
DEFVAR_SPECIFIER ("default-toolbar-width", &Vdefault_toolbar_width /*
*/ );
Vdefault_toolbar_width = Fmake_specifier (Qnatnum);
set_specifier_caching (Vdefault_toolbar_width,
- slot_offset (struct window,
- default_toolbar_width),
+ offsetof (struct window, default_toolbar_width),
default_toolbar_size_changed_in_window,
- slot_offset (struct frame,
- default_toolbar_width),
+ offsetof (struct frame, default_toolbar_width),
default_toolbar_size_changed_in_frame);
DEFVAR_SPECIFIER ("top-toolbar-height",
*/ );
Vtoolbar_size[TOP_TOOLBAR] = Fmake_specifier (Qnatnum);
set_specifier_caching (Vtoolbar_size[TOP_TOOLBAR],
- slot_offset (struct window,
- toolbar_size[TOP_TOOLBAR]),
+ offsetof (struct window, toolbar_size[TOP_TOOLBAR]),
toolbar_geometry_changed_in_window,
- slot_offset (struct frame,
- toolbar_size[TOP_TOOLBAR]),
+ offsetof (struct frame, toolbar_size[TOP_TOOLBAR]),
frame_size_slipped);
DEFVAR_SPECIFIER ("bottom-toolbar-height",
*/ );
Vtoolbar_size[BOTTOM_TOOLBAR] = Fmake_specifier (Qnatnum);
set_specifier_caching (Vtoolbar_size[BOTTOM_TOOLBAR],
- slot_offset (struct window,
- toolbar_size[BOTTOM_TOOLBAR]),
+ offsetof (struct window, toolbar_size[BOTTOM_TOOLBAR]),
toolbar_geometry_changed_in_window,
- slot_offset (struct frame,
- toolbar_size[BOTTOM_TOOLBAR]),
+ offsetof (struct frame, toolbar_size[BOTTOM_TOOLBAR]),
frame_size_slipped);
DEFVAR_SPECIFIER ("left-toolbar-width",
*/ );
Vtoolbar_size[LEFT_TOOLBAR] = Fmake_specifier (Qnatnum);
set_specifier_caching (Vtoolbar_size[LEFT_TOOLBAR],
- slot_offset (struct window,
- toolbar_size[LEFT_TOOLBAR]),
+ offsetof (struct window, toolbar_size[LEFT_TOOLBAR]),
toolbar_geometry_changed_in_window,
- slot_offset (struct frame,
- toolbar_size[LEFT_TOOLBAR]),
+ offsetof (struct frame, toolbar_size[LEFT_TOOLBAR]),
frame_size_slipped);
DEFVAR_SPECIFIER ("right-toolbar-width",
*/ );
Vtoolbar_size[RIGHT_TOOLBAR] = Fmake_specifier (Qnatnum);
set_specifier_caching (Vtoolbar_size[RIGHT_TOOLBAR],
- slot_offset (struct window,
- toolbar_size[RIGHT_TOOLBAR]),
+ offsetof (struct window, toolbar_size[RIGHT_TOOLBAR]),
toolbar_geometry_changed_in_window,
- slot_offset (struct frame,
- toolbar_size[RIGHT_TOOLBAR]),
+ offsetof (struct frame, toolbar_size[RIGHT_TOOLBAR]),
frame_size_slipped);
fb = Qnil;
*/ );
Vdefault_toolbar_border_width = Fmake_specifier (Qnatnum);
set_specifier_caching (Vdefault_toolbar_border_width,
- slot_offset (struct window,
- default_toolbar_border_width),
+ offsetof (struct window, default_toolbar_border_width),
default_toolbar_border_width_changed_in_window,
- slot_offset (struct frame,
- default_toolbar_border_width),
+ offsetof (struct frame, default_toolbar_border_width),
default_toolbar_border_width_changed_in_frame);
DEFVAR_SPECIFIER ("top-toolbar-border-width",
*/ );
Vtoolbar_border_width[TOP_TOOLBAR] = Fmake_specifier (Qnatnum);
set_specifier_caching (Vtoolbar_border_width[TOP_TOOLBAR],
- slot_offset (struct window,
- toolbar_border_width[TOP_TOOLBAR]),
+ offsetof (struct window,
+ toolbar_border_width[TOP_TOOLBAR]),
toolbar_geometry_changed_in_window,
- slot_offset (struct frame,
- toolbar_border_width[TOP_TOOLBAR]),
+ offsetof (struct frame,
+ toolbar_border_width[TOP_TOOLBAR]),
frame_size_slipped);
DEFVAR_SPECIFIER ("bottom-toolbar-border-width",
*/ );
Vtoolbar_border_width[BOTTOM_TOOLBAR] = Fmake_specifier (Qnatnum);
set_specifier_caching (Vtoolbar_border_width[BOTTOM_TOOLBAR],
- slot_offset (struct window,
- toolbar_border_width[BOTTOM_TOOLBAR]),
+ offsetof (struct window,
+ toolbar_border_width[BOTTOM_TOOLBAR]),
toolbar_geometry_changed_in_window,
- slot_offset (struct frame,
- toolbar_border_width[BOTTOM_TOOLBAR]),
+ offsetof (struct frame,
+ toolbar_border_width[BOTTOM_TOOLBAR]),
frame_size_slipped);
DEFVAR_SPECIFIER ("left-toolbar-border-width",
*/ );
Vtoolbar_border_width[LEFT_TOOLBAR] = Fmake_specifier (Qnatnum);
set_specifier_caching (Vtoolbar_border_width[LEFT_TOOLBAR],
- slot_offset (struct window,
- toolbar_border_width[LEFT_TOOLBAR]),
+ offsetof (struct window,
+ toolbar_border_width[LEFT_TOOLBAR]),
toolbar_geometry_changed_in_window,
- slot_offset (struct frame,
- toolbar_border_width[LEFT_TOOLBAR]),
+ offsetof (struct frame,
+ toolbar_border_width[LEFT_TOOLBAR]),
frame_size_slipped);
DEFVAR_SPECIFIER ("right-toolbar-border-width",
*/ );
Vtoolbar_border_width[RIGHT_TOOLBAR] = Fmake_specifier (Qnatnum);
set_specifier_caching (Vtoolbar_border_width[RIGHT_TOOLBAR],
- slot_offset (struct window,
- toolbar_border_width[RIGHT_TOOLBAR]),
+ offsetof (struct window,
+ toolbar_border_width[RIGHT_TOOLBAR]),
toolbar_geometry_changed_in_window,
- slot_offset (struct frame,
- toolbar_border_width[RIGHT_TOOLBAR]),
+ offsetof (struct frame,
+ toolbar_border_width[RIGHT_TOOLBAR]),
frame_size_slipped);
fb = Qnil;
*/ );
Vdefault_toolbar_visible_p = Fmake_specifier (Qboolean);
set_specifier_caching (Vdefault_toolbar_visible_p,
- slot_offset (struct window,
- default_toolbar_visible_p),
+ offsetof (struct window, default_toolbar_visible_p),
default_toolbar_visible_p_changed_in_window,
- slot_offset (struct frame,
- default_toolbar_visible_p),
+ offsetof (struct frame, default_toolbar_visible_p),
default_toolbar_visible_p_changed_in_frame);
DEFVAR_SPECIFIER ("top-toolbar-visible-p",
*/ );
Vtoolbar_visible_p[TOP_TOOLBAR] = Fmake_specifier (Qboolean);
set_specifier_caching (Vtoolbar_visible_p[TOP_TOOLBAR],
- slot_offset (struct window,
- toolbar_visible_p[TOP_TOOLBAR]),
+ offsetof (struct window,
+ toolbar_visible_p[TOP_TOOLBAR]),
toolbar_geometry_changed_in_window,
- slot_offset (struct frame,
- toolbar_visible_p[TOP_TOOLBAR]),
+ offsetof (struct frame,
+ toolbar_visible_p[TOP_TOOLBAR]),
frame_size_slipped);
DEFVAR_SPECIFIER ("bottom-toolbar-visible-p",
*/ );
Vtoolbar_visible_p[BOTTOM_TOOLBAR] = Fmake_specifier (Qboolean);
set_specifier_caching (Vtoolbar_visible_p[BOTTOM_TOOLBAR],
- slot_offset (struct window,
- toolbar_visible_p[BOTTOM_TOOLBAR]),
+ offsetof (struct window,
+ toolbar_visible_p[BOTTOM_TOOLBAR]),
toolbar_geometry_changed_in_window,
- slot_offset (struct frame,
- toolbar_visible_p[BOTTOM_TOOLBAR]),
+ offsetof (struct frame,
+ toolbar_visible_p[BOTTOM_TOOLBAR]),
frame_size_slipped);
DEFVAR_SPECIFIER ("left-toolbar-visible-p",
*/ );
Vtoolbar_visible_p[LEFT_TOOLBAR] = Fmake_specifier (Qboolean);
set_specifier_caching (Vtoolbar_visible_p[LEFT_TOOLBAR],
- slot_offset (struct window,
- toolbar_visible_p[LEFT_TOOLBAR]),
+ offsetof (struct window,
+ toolbar_visible_p[LEFT_TOOLBAR]),
toolbar_geometry_changed_in_window,
- slot_offset (struct frame,
- toolbar_visible_p[LEFT_TOOLBAR]),
+ offsetof (struct frame,
+ toolbar_visible_p[LEFT_TOOLBAR]),
frame_size_slipped);
DEFVAR_SPECIFIER ("right-toolbar-visible-p",
*/ );
Vtoolbar_visible_p[RIGHT_TOOLBAR] = Fmake_specifier (Qboolean);
set_specifier_caching (Vtoolbar_visible_p[RIGHT_TOOLBAR],
- slot_offset (struct window,
- toolbar_visible_p[RIGHT_TOOLBAR]),
+ offsetof (struct window,
+ toolbar_visible_p[RIGHT_TOOLBAR]),
toolbar_geometry_changed_in_window,
- slot_offset (struct frame,
- toolbar_visible_p[RIGHT_TOOLBAR]),
+ offsetof (struct frame,
+ toolbar_visible_p[RIGHT_TOOLBAR]),
frame_size_slipped);
/* initially, top inherits from default; this can be
*/ );
Vtoolbar_buttons_captioned_p = Fmake_specifier (Qboolean);
set_specifier_caching (Vtoolbar_buttons_captioned_p,
- slot_offset (struct window,
- toolbar_buttons_captioned_p),
+ offsetof (struct window, toolbar_buttons_captioned_p),
toolbar_buttons_captioned_p_changed,
0, 0);
set_specifier_fallback (Vtoolbar_buttons_captioned_p,