(Charc_dynarr): New type.

[chise/xemacs-chise.git-] / src / toolbar-x.c

diff --git a/src/toolbar-x.c b/src/toolbar-x.c
index 5b0fb72..b1f2e11 100644 (file)
--- a/src/toolbar-x.c
+++ b/src/toolbar-x.c
@@ -109,7 +109,7 @@ x_output_toolbar_button (struct frame *f, Lisp_Object button)
   GC top_shadow_gc, bottom_shadow_gc, background_gc;
   Lisp_Object instance, frame, window, glyph;
   struct toolbar_button *tb = XTOOLBAR_BUTTON (button);
-  struct Lisp_Image_Instance *p;
+  Lisp_Image_Instance *p;
   struct window *w;
   int vertical = tb->vertical;
   int border_width = tb->border_width;
@@ -223,7 +223,7 @@ x_output_toolbar_button (struct frame *f, Lisp_Object button)
            WINDOW_FACE_CACHEL (w, DEFAULT_INDEX);
          struct display_line dl;
          Lisp_Object string = IMAGE_INSTANCE_TEXT_STRING (p);
-         unsigned char charsets[NUM_LEADING_BYTES];
+         Charset_ID charsets[NUM_LEADING_BYTES];
          Emchar_dynarr *buf;
          struct font_metric_info fm;
 
@@ -296,9 +296,9 @@ x_get_button_size (struct frame *f, Lisp_Object window,
        return XINT (f->toolbar_size[pos]);
 
       if (vert)
-       size = glyph_height (glyph, Vdefault_face, 0, window);
+       size = glyph_height (glyph, window);
       else
-       size = glyph_width (glyph, Vdefault_face, 0, window);
+       size = glyph_width (glyph, window);
     }
 
   if (!size)