comparison src/toolbar.c @ 5117:3742ea8250b5 ben-lisp-object ben-lisp-object-final-ws-year-2005

Checking in final CVS version of workspace 'ben-lisp-object'
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 00:20:27 -0600
parents facf3239ba30
children e0db3c197671
comparison
equal deleted inserted replaced
5116:e56f73345619 5117:3742ea8250b5
86 mark_object (data->callback); 86 mark_object (data->callback);
87 mark_object (data->enabled_p); 87 mark_object (data->enabled_p);
88 return data->help_string; 88 return data->help_string;
89 } 89 }
90 90
91 DEFINE_LRECORD_IMPLEMENTATION ("toolbar-button", toolbar_button, 91 DEFINE_NONDUMPABLE_LISP_OBJECT ("toolbar-button", toolbar_button,
92 0, /*dumpable-flag*/ 92 mark_toolbar_button, 0, 0, 0, 0,
93 mark_toolbar_button, 0, 0, 0, 0, 93 toolbar_button_description,
94 toolbar_button_description, 94 struct toolbar_button);
95 struct toolbar_button);
96 95
97 DEFUN ("toolbar-button-p", Ftoolbar_button_p, 1, 1, 0, /* 96 DEFUN ("toolbar-button-p", Ftoolbar_button_p, 1, 1, 0, /*
98 Return non-nil if OBJECT is a toolbar button. 97 Return non-nil if OBJECT is a toolbar button.
99 */ 98 */
100 (object)) 99 (object))
301 elt = XVECTOR_DATA (desc); 300 elt = XVECTOR_DATA (desc);
302 buffer = XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->buffer; 301 buffer = XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f))->buffer;
303 302
304 if (!tb) 303 if (!tb)
305 { 304 {
306 tb = ALLOC_LCRECORD_TYPE (struct toolbar_button, &lrecord_toolbar_button); 305 tb = XTOOLBAR_BUTTON (ALLOC_LISP_OBJECT (toolbar_button));
307 tb->next = Qnil; 306 tb->next = Qnil;
308 tb->frame = wrap_frame (f); 307 tb->frame = wrap_frame (f);
309 tb->up_glyph = Qnil; 308 tb->up_glyph = Qnil;
310 tb->down_glyph = Qnil; 309 tb->down_glyph = Qnil;
311 tb->disabled_glyph = Qnil; 310 tb->disabled_glyph = Qnil;
1334 1333
1335 1334
1336 void 1335 void
1337 syms_of_toolbar (void) 1336 syms_of_toolbar (void)
1338 { 1337 {
1339 INIT_LRECORD_IMPLEMENTATION (toolbar_button); 1338 INIT_LISP_OBJECT (toolbar_button);
1340 1339
1341 DEFSYMBOL_MULTIWORD_PREDICATE (Qtoolbar_buttonp); 1340 DEFSYMBOL_MULTIWORD_PREDICATE (Qtoolbar_buttonp);
1342 DEFSYMBOL (Q2D); 1341 DEFSYMBOL (Q2D);
1343 DEFSYMBOL (Q3D); 1342 DEFSYMBOL (Q3D);
1344 DEFSYMBOL (Q2d); 1343 DEFSYMBOL (Q2d);