/* Synched up with: Not in FSF. */
-#ifndef _XEMACS_TOOLBAR_H_
-#define _XEMACS_TOOLBAR_H_
-
-#include "specifier.h"
+#ifndef INCLUDED_toolbar_h_
+#define INCLUDED_toolbar_h_
#ifdef HAVE_TOOLBARS
+#include "specifier.h"
+
#define FRAME_TOOLBAR_BUTTONS(frame, pos) \
((frame)->toolbar_buttons[pos])
#define FRAME_CURRENT_TOOLBAR_SIZE(frame, pos) \
((frame)->current_toolbar_size[pos])
#define DEVICE_SUPPORTS_TOOLBARS_P(d) \
- (HAS_DEVMETH_P ((d), output_frame_toolbars))
+ HAS_DEVMETH_P (d, output_frame_toolbars)
struct toolbar_button
{
int dirty;
/* is this button in a left or right toolbar? */
int vertical;
- /* border_width when this button was layed out */
+ /* border_width when this button was laid out */
int border_width;
};
#define XTOOLBAR_BUTTON(x) XRECORD (x, toolbar_button, struct toolbar_button)
#define XSETTOOLBAR_BUTTON(x, p) XSETRECORD (x, p, toolbar_button)
#define TOOLBAR_BUTTONP(x) RECORDP (x, toolbar_button)
-#define GC_TOOLBAR_BUTTONP(x) GC_RECORDP (x, toolbar_button)
#define CHECK_TOOLBAR_BUTTON(x) CHECK_RECORD (x, toolbar_button)
#define CONCHECK_TOOLBAR_BUTTON(x) CONCHECK_RECORD (x, toolbar_button)
extern Lisp_Object Vtoolbar_size[4];
extern Lisp_Object Vtoolbar_border_width[4];
void update_frame_toolbars (struct frame *f);
+void update_frame_toolbars_geometry (struct frame *f);
void init_frame_toolbars (struct frame *f);
void init_device_toolbars (struct device *d);
void init_global_toolbars (struct device *d);
#endif /* HAVE_TOOLBARS */
-#endif /* _XEMACS_TOOLBAR_H_ */
+#endif /* INCLUDED_toolbar_h_ */