X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Ftoolbar.c;h=573241acc5cc061cfe55899345c8896473744b3b;hb=557a8105b1bfe98e9a52f16fc2d4b10107f66b19;hp=963d373755ff502b18a5a1da135c7fed187dc2d0;hpb=a1655b870904de973c366d85ebdc8adde4ef5e1e;p=chise%2Fxemacs-chise.git diff --git a/src/toolbar.c b/src/toolbar.c index 963d373..573241a 100644 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -73,24 +73,8 @@ mark_toolbar_button (Lisp_Object obj) return data->help_string; } -static void -print_toolbar_button (Lisp_Object obj, Lisp_Object printcharfun, - int escapeflag) -{ - struct toolbar_button *tb = XTOOLBAR_BUTTON (obj); - char buf[100]; - - if (print_readably) - error ("printing unreadable object #", - tb->header.uid); - - sprintf (buf, "#", tb->header.uid); - write_c_string (buf, printcharfun); -} - DEFINE_LRECORD_IMPLEMENTATION ("toolbar-button", toolbar_button, - mark_toolbar_button, print_toolbar_button, - 0, 0, 0, 0, + mark_toolbar_button, 0, 0, 0, 0, 0, struct toolbar_button); DEFUN ("toolbar-button-p", Ftoolbar_button_p, 1, 1, 0, /* @@ -1040,7 +1024,7 @@ whole, use `check-valid-instantiator' with a specifier type of 'toolbar. which buffer to check in. #### I think this is a bad thing. See if we can't get enough information to this function so that it can check. - + #### Wrong. We shouldn't be checking the value at all here. The user might set or change the value at any time. */ value = Fsymbol_value (elt[0]); @@ -1160,14 +1144,9 @@ toolbar_after_change (Lisp_Object specifier, Lisp_Object locale) DEFUN ("toolbar-specifier-p", Ftoolbar_specifier_p, 1, 1, 0, /* Return non-nil if OBJECT is a toolbar specifier. -Toolbar specifiers are used to specify the format of a toolbar. -The values of the variables `default-toolbar', `top-toolbar', -`left-toolbar', `right-toolbar', and `bottom-toolbar' are always -toolbar specifiers. - -Valid toolbar instantiators are called "toolbar descriptors" -and are lists of vectors. See `default-toolbar' for a description -of the exact format. + +See `make-toolbar-specifier' for a description of possible toolbar +instantiators. */ (object)) {