Mercurial > hg > xemacs-beta
comparison src/toolbar.h @ 5133:444a448b2f53
Merge branch ben-lisp-object into default branch
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sun, 07 Mar 2010 06:47:37 -0600 |
parents | 7be849cb8828 |
children | 308d34e9f07d |
comparison
equal
deleted
inserted
replaced
5113:b2dcf6a6d8ab | 5133:444a448b2f53 |
---|---|
41 #define DEVICE_SUPPORTS_TOOLBARS_P(d) \ | 41 #define DEVICE_SUPPORTS_TOOLBARS_P(d) \ |
42 HAS_DEVMETH_P (d, output_frame_toolbars) | 42 HAS_DEVMETH_P (d, output_frame_toolbars) |
43 | 43 |
44 struct toolbar_button | 44 struct toolbar_button |
45 { | 45 { |
46 struct LCRECORD_HEADER header; | 46 NORMAL_LISP_OBJECT_HEADER header; |
47 | 47 |
48 Lisp_Object next; | 48 Lisp_Object next; |
49 Lisp_Object frame; | 49 Lisp_Object frame; |
50 | 50 |
51 Lisp_Object up_glyph; | 51 Lisp_Object up_glyph; |
72 int vertical; | 72 int vertical; |
73 /* border_width when this button was laid out */ | 73 /* border_width when this button was laid out */ |
74 int border_width; | 74 int border_width; |
75 }; | 75 }; |
76 | 76 |
77 DECLARE_LRECORD (toolbar_button, struct toolbar_button); | 77 DECLARE_LISP_OBJECT (toolbar_button, struct toolbar_button); |
78 #define XTOOLBAR_BUTTON(x) XRECORD (x, toolbar_button, struct toolbar_button) | 78 #define XTOOLBAR_BUTTON(x) XRECORD (x, toolbar_button, struct toolbar_button) |
79 #define wrap_toolbar_button(p) wrap_record (p, toolbar_button) | 79 #define wrap_toolbar_button(p) wrap_record (p, toolbar_button) |
80 #define TOOLBAR_BUTTONP(x) RECORDP (x, toolbar_button) | 80 #define TOOLBAR_BUTTONP(x) RECORDP (x, toolbar_button) |
81 #define CHECK_TOOLBAR_BUTTON(x) CHECK_RECORD (x, toolbar_button) | 81 #define CHECK_TOOLBAR_BUTTON(x) CHECK_RECORD (x, toolbar_button) |
82 #define CONCHECK_TOOLBAR_BUTTON(x) CONCHECK_RECORD (x, toolbar_button) | 82 #define CONCHECK_TOOLBAR_BUTTON(x) CONCHECK_RECORD (x, toolbar_button) |