update.

[chise/xemacs-chise.git.1] / src / toolbar.h

diff --git a/src/toolbar.h b/src/toolbar.h
index 6440767..fc830f9 100644 (file)
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -22,8 +22,8 @@ Boston, MA 02111-1307, USA.  */
 
 /* Synched up with: Not in FSF. */
 
-#ifndef _XEMACS_TOOLBAR_H_
-#define _XEMACS_TOOLBAR_H_
+#ifndef INCLUDED_toolbar_h_
+#define INCLUDED_toolbar_h_
 
 #ifdef HAVE_TOOLBARS
 
@@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA.  */
 #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
 {
@@ -100,6 +100,7 @@ DECLARE_SPECIFIER_TYPE (toolbar);
 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);
@@ -110,4 +111,4 @@ void mark_frame_toolbar_buttons_dirty (struct frame *f, enum toolbar_pos pos);
 
 #endif /* HAVE_TOOLBARS */
 
-#endif /* _XEMACS_TOOLBAR_H_ */
+#endif /* INCLUDED_toolbar_h_ */