comparison src/frameslots.h @ 286:57709be46d1b r21-0b41

Import from CVS: tag r21-0b41
author cvs
date Mon, 13 Aug 2007 10:35:03 +0200
parents c42ec1d1cded
children b8cc9ab3f761
comparison
equal deleted inserted replaced
285:9a3756523c1b 286:57709be46d1b
18 along with XEmacs; see the file COPYING. If not, write to 18 along with XEmacs; see the file COPYING. If not, write to
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
20 Boston, MA 02111-1307, USA. */ 20 Boston, MA 02111-1307, USA. */
21 21
22 /* Synched up with: FSF 19.30. Split out of frame.h. */ 22 /* Synched up with: FSF 19.30. Split out of frame.h. */
23
24 #ifdef FRAME_SLOT_DECLARATION
25 #define MARKED_SLOT_ARRAY(slot, size) MARKED_SLOT(slot[size])
26 #else
27 #define MARKED_SLOT_ARRAY(slot, size) do { \
28 int mslotidx; \
29 for (mslotidx = 0; mslotidx < size; mslotidx++) \
30 { \
31 MARKED_SLOT (slot[mslotidx]); \
32 } \
33 } while (0);
34 #endif
23 35
24 /* device frame belongs to. */ 36 /* device frame belongs to. */
25 MARKED_SLOT (device); 37 MARKED_SLOT (device);
26 38
27 /* Name of this frame: a Lisp string. 39 /* Name of this frame: a Lisp string.
115 that we need to know when they've changed. */ 127 that we need to know when they've changed. */
116 MARKED_SLOT (default_toolbar_width); 128 MARKED_SLOT (default_toolbar_width);
117 MARKED_SLOT (default_toolbar_height); 129 MARKED_SLOT (default_toolbar_height);
118 MARKED_SLOT (default_toolbar_visible_p); 130 MARKED_SLOT (default_toolbar_visible_p);
119 MARKED_SLOT (default_toolbar_border_width); 131 MARKED_SLOT (default_toolbar_border_width);
132
133 /* List of toolbar buttons of current toolbars */
134 MARKED_SLOT_ARRAY (toolbar_buttons, 4);
135 /* Size of the toolbars. The frame-local toolbar space is
136 subtracted before the windows are arranged. Window and buffer
137 local toolbars overlay their windows. */
138 MARKED_SLOT_ARRAY (toolbar_size, 4);
139 /* Visibility of the toolbars. This acts as a valve for toolbar_size. */
140 MARKED_SLOT_ARRAY (toolbar_visible_p, 4);
141 /* Thickness of the border around the toolbar. */
142 MARKED_SLOT_ARRAY (toolbar_border_width, 4);
120 #endif 143 #endif
121 144
122 /* Possible frame-local default for outside margin widths. */ 145 /* Possible frame-local default for outside margin widths. */
123 MARKED_SLOT (left_margin_width); 146 MARKED_SLOT (left_margin_width);
124 MARKED_SLOT (right_margin_width); 147 MARKED_SLOT (right_margin_width);
148
149 #undef MARKED_SLOT
150 #undef MARKED_SLOT_ARRAY
151 #undef FRAME_SLOT_DECLARATION