/* 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"
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;
struct display_line dl;
Lisp_Object string = IMAGE_INSTANCE_TEXT_STRING (p);
Charset_ID charsets[NUM_LEADING_BYTES];
- Emchar_dynarr *buf;
+ Charc_dynarr *buf;
struct font_metric_info fm;
/* This could be true if we were called via the Expose event
MARK_TOOLBAR_CHANGED;
return;
}
- buf = Dynarr_new (Emchar);
- convert_bufbyte_string_into_emchar_dynarr
+ buf = Dynarr_new (Charc);
+ convert_bufbyte_string_into_charc_dynarr
(XSTRING_DATA (string), XSTRING_LENGTH (string), buf);
- find_charsets_in_emchar_string (charsets, Dynarr_atp (buf, 0),
- Dynarr_length (buf));
+ find_charsets_in_charc_string (charsets, Dynarr_atp (buf, 0),
+ Dynarr_length (buf));
ensure_face_cachel_complete (cachel, window, charsets);
face_cachel_charset_font_metric_info (cachel, charsets, &fm);
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)