comparison src/toolbar.c @ 424:11054d720c21 r21-2-20

Import from CVS: tag r21-2-20
author cvs
date Mon, 13 Aug 2007 11:26:11 +0200
parents 41dbb7a9d5f2
children
comparison
equal deleted inserted replaced
423:28d9c139be4c 424:11054d720c21
55 55
56 Lisp_Object Qinit_toolbar_from_resources; 56 Lisp_Object Qinit_toolbar_from_resources;
57 57
58 58
59 static Lisp_Object 59 static Lisp_Object
60 mark_toolbar_button (Lisp_Object obj, void (*markobj) (Lisp_Object)) 60 mark_toolbar_button (Lisp_Object obj)
61 { 61 {
62 struct toolbar_button *data = XTOOLBAR_BUTTON (obj); 62 struct toolbar_button *data = XTOOLBAR_BUTTON (obj);
63 markobj (data->next); 63 mark_object (data->next);
64 markobj (data->frame); 64 mark_object (data->frame);
65 markobj (data->up_glyph); 65 mark_object (data->up_glyph);
66 markobj (data->down_glyph); 66 mark_object (data->down_glyph);
67 markobj (data->disabled_glyph); 67 mark_object (data->disabled_glyph);
68 markobj (data->cap_up_glyph); 68 mark_object (data->cap_up_glyph);
69 markobj (data->cap_down_glyph); 69 mark_object (data->cap_down_glyph);
70 markobj (data->cap_disabled_glyph); 70 mark_object (data->cap_disabled_glyph);
71 markobj (data->callback); 71 mark_object (data->callback);
72 markobj (data->enabled_p); 72 mark_object (data->enabled_p);
73 return data->help_string; 73 return data->help_string;
74 } 74 }
75 75
76 static void 76 static void
77 print_toolbar_button (Lisp_Object obj, Lisp_Object printcharfun, 77 print_toolbar_button (Lisp_Object obj, Lisp_Object printcharfun,
1310 SPECIFIER_HAS_METHOD (toolbar, validate); 1310 SPECIFIER_HAS_METHOD (toolbar, validate);
1311 SPECIFIER_HAS_METHOD (toolbar, after_change); 1311 SPECIFIER_HAS_METHOD (toolbar, after_change);
1312 } 1312 }
1313 1313
1314 void 1314 void
1315 reinit_specifier_type_create_toolbar (void)
1316 {
1317 REINITIALIZE_SPECIFIER_TYPE (toolbar);
1318 }
1319
1320 void
1315 specifier_vars_of_toolbar (void) 1321 specifier_vars_of_toolbar (void)
1316 { 1322 {
1317 Lisp_Object fb; 1323 Lisp_Object fb;
1318 1324
1319 DEFVAR_SPECIFIER ("default-toolbar", &Vdefault_toolbar /* 1325 DEFVAR_SPECIFIER ("default-toolbar", &Vdefault_toolbar /*