X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Ftoolbar-x.c;h=b1f2e115b52057015bbdc2d1db1c7b0b43bbd810;hb=a427521703d69ab8a90a1118e139da303f6d8024;hp=9961950a12f9dcb3a1b4607ef4b4749cf63f7c2d;hpb=cb9f6f4eadc44f1becb32cbbd1db26449e347755;p=chise%2Fxemacs-chise.git-

diff --git a/src/toolbar-x.c b/src/toolbar-x.c
index 9961950..b1f2e11 100644
--- a/src/toolbar-x.c
+++ b/src/toolbar-x.c
@@ -77,7 +77,8 @@ x_draw_blank_toolbar_button (struct frame *f, int x, int y, int width,
 
   /* Draw the outline. */
   x_output_shadows (f, sx, sy, swidth, sheight, top_shadow_gc,
-		    bottom_shadow_gc, background_gc, shadow_thickness);
+		    bottom_shadow_gc, background_gc, shadow_thickness,
+		    EDGE_ALL);
 
   /* Blank the middle. */
   XFillRectangle (dpy, x_win, background_gc, sx + shadow_thickness,
@@ -108,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;
@@ -158,7 +159,8 @@ x_output_toolbar_button (struct frame *f, Lisp_Object button)
   x_output_shadows (f, tb->x + x_adj, tb->y + y_adj,
 		    tb->width + width_adj, tb->height + height_adj,
 		    top_shadow_gc,
-		    bottom_shadow_gc, background_gc, shadow_thickness);
+		    bottom_shadow_gc, background_gc, shadow_thickness,
+		    EDGE_ALL);
 
   /* Clear the pixmap area. */
   XFillRectangle (dpy, x_win, background_gc, tb->x + x_adj + shadow_thickness,
@@ -211,8 +213,8 @@ x_output_toolbar_button (struct frame *f, Lisp_Object button)
 	    }
 
 	  x_output_x_pixmap (f, XIMAGE_INSTANCE (instance), tb->x + x_offset,
-			     tb->y + y_offset, 0, 0, 0, 0, width, height,
-			     0, 0, 0, background_gc);
+			     tb->y + y_offset, 0, 0, width, height,
+			     0, 0, background_gc);
 	}
       else if (IMAGE_INSTANCE_TYPE (p) == IMAGE_TEXT)
 	{
@@ -221,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;
 
@@ -294,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)