comparison src/toolbar.c @ 5118:e0db3c197671 ben-lisp-object

merge up to latest default branch, doesn't compile yet
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:18:49 -0600
parents 3742ea8250b5 d9ca850d40de
children 623d57b7fbe8
comparison
equal deleted inserted replaced
5117:3742ea8250b5 5118:e0db3c197671
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_NONDUMPABLE_LISP_OBJECT ("toolbar-button", toolbar_button, 91 DEFINE_NODUMP_LISP_OBJECT ("toolbar-button", toolbar_button,
92 mark_toolbar_button, 0, 0, 0, 0, 92 mark_toolbar_button, 0, 0, 0, 0,
93 toolbar_button_description, 93 toolbar_button_description,
94 struct toolbar_button); 94 struct toolbar_button);
95 95
96 DEFUN ("toolbar-button-p", Ftoolbar_button_p, 1, 1, 0, /* 96 DEFUN ("toolbar-button-p", Ftoolbar_button_p, 1, 1, 0, /*
97 Return non-nil if OBJECT is a toolbar button. 97 Return non-nil if OBJECT is a toolbar button.
98 */ 98 */
99 (object)) 99 (object))