This commit was generated by cvs2svn to compensate for changes in r4969,

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

diff --git a/src/toolbar-x.c b/src/toolbar-x.c
index 64f2b6c..40c2f02 100644 (file)
--- a/src/toolbar-x.c
+++ b/src/toolbar-x.c
@@ -23,16 +23,16 @@ Boston, MA 02111-1307, USA.  */
 
 /* Synched up with: Not in FSF. */
 
-/* This file Mule-ized (more like Mule-verified) by Ben Wing, 7-8-00. */
-
 #include <config.h>
 #include "lisp.h"
 
 #include "console-x.h"
 #include "glyphs-x.h"
 #include "objects-x.h"
+#include "xgccache.h"
 #include "EmacsFrame.h"
 #include "EmacsFrameP.h"
+#include "EmacsManager.h"
 
 #include "faces.h"
 #include "frame.h"
@@ -79,8 +79,7 @@ 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,
-                   EDGE_ALL);
+                   bottom_shadow_gc, background_gc, shadow_thickness);
 
   /* Blank the middle. */
   XFillRectangle (dpy, x_win, background_gc, sx + shadow_thickness,
@@ -111,7 +110,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);
-  Lisp_Image_Instance *p;
+  struct Lisp_Image_Instance *p;
   struct window *w;
   int vertical = tb->vertical;
   int border_width = tb->border_width;
@@ -161,8 +160,7 @@ 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,
-                   EDGE_ALL);
+                   bottom_shadow_gc, background_gc, shadow_thickness);
 
   /* Clear the pixmap area. */
   XFillRectangle (dpy, x_win, background_gc, tb->x + x_adj + shadow_thickness,
@@ -215,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, width, height,
-                            0, 0, background_gc);
+                            tb->y + y_offset, 0, 0, 0, 0, width, height,
+                            0, 0, 0, background_gc);
        }
       else if (IMAGE_INSTANCE_TYPE (p) == IMAGE_TEXT)
        {
@@ -298,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, window);
+       size = glyph_height (glyph, Vdefault_face, 0, window);
       else
-       size = glyph_width (glyph, window);
+       size = glyph_width (glyph, Vdefault_face, 0, window);
     }
 
   if (!size)
@@ -508,9 +506,9 @@ x_output_toolbar (struct frame *f, enum toolbar_pos pos)
       Lisp_Object frame;
 
       XSETFRAME (frame, f);
-      redisplay_clear_region (frame,
-                             DEFAULT_INDEX, FRAME_PIXWIDTH (f) - 1, y, 1,
-                             bar_height);
+      DEVMETH (d, clear_region, (frame,
+                                DEFAULT_INDEX, FRAME_PIXWIDTH (f) - 1, y, 1,
+                                bar_height));
     }
 
   SET_TOOLBAR_WAS_VISIBLE_FLAG (f, pos, 1);
@@ -546,7 +544,7 @@ x_clear_toolbar (struct frame *f, enum toolbar_pos pos, int thickness_change)
 
   SET_TOOLBAR_WAS_VISIBLE_FLAG (f, pos, 0);
 
-  redisplay_clear_region (frame, DEFAULT_INDEX, x, y, width, height);
+  DEVMETH (d, clear_region, (frame, DEFAULT_INDEX, x, y, width, height));
   XFlush (DEVICE_X_DISPLAY (d));
 }