X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Ftoolbar.h;h=fc830f95e475d6f1047b2985ed3b222f4b53de75;hb=506a27d9690049e121fccf1a8947ec57e62055aa;hp=543ed2c0ed660a15a6f41ac1cdd0e15f0e49e371;hpb=77dcef404dc78635f6ffa8f71a803d2bc7cc8921;p=chise%2Fxemacs-chise.git.1

diff --git a/src/toolbar.h b/src/toolbar.h
index 543ed2c..fc830f9 100644
--- 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
 {
@@ -73,7 +73,6 @@ DECLARE_LRECORD (toolbar_button, struct toolbar_button);
 #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)
 
@@ -101,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);
@@ -111,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_ */