diff 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
line wrap: on
line diff
--- a/src/toolbar.c	Sat Dec 26 00:20:16 2009 -0600
+++ b/src/toolbar.c	Sat Dec 26 00:20:27 2009 -0600
@@ -88,11 +88,10 @@
   return data->help_string;
 }
 
-DEFINE_LRECORD_IMPLEMENTATION ("toolbar-button", toolbar_button,
-			       0, /*dumpable-flag*/
-			       mark_toolbar_button, 0, 0, 0, 0, 
-			       toolbar_button_description,
-			       struct toolbar_button);
+DEFINE_NONDUMPABLE_LISP_OBJECT ("toolbar-button", toolbar_button,
+					   mark_toolbar_button, 0, 0, 0, 0, 
+					   toolbar_button_description,
+					   struct toolbar_button);
 
 DEFUN ("toolbar-button-p", Ftoolbar_button_p, 1, 1, 0, /*
 Return non-nil if OBJECT is a toolbar button.
@@ -303,7 +302,7 @@
 
   if (!tb)
     {
-      tb = ALLOC_LCRECORD_TYPE (struct toolbar_button, &lrecord_toolbar_button);
+      tb = XTOOLBAR_BUTTON (ALLOC_LISP_OBJECT (toolbar_button));
       tb->next = Qnil;
       tb->frame = wrap_frame (f);
       tb->up_glyph = Qnil;
@@ -1336,7 +1335,7 @@
 void
 syms_of_toolbar (void)
 {
-  INIT_LRECORD_IMPLEMENTATION (toolbar_button);
+  INIT_LISP_OBJECT (toolbar_button);
 
   DEFSYMBOL_MULTIWORD_PREDICATE (Qtoolbar_buttonp);
   DEFSYMBOL (Q2D);