From c1a03ef21963b312601480bf21ad28896cf4db82 Mon Sep 17 00:00:00 2001 From: tomo Date: Fri, 9 Jun 2000 09:23:33 +0000 Subject: [PATCH] (x_output_toolbar_button): Use instead of for buf; use `convert_bufbyte_string_into_charc_dynarr' instead of `convert_bufbyte_string_into_emchar_dynarr'; use `find_charsets_in_charc_string' instead of `find_charsets_in_emchar_string'. --- src/toolbar-x.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/toolbar-x.c b/src/toolbar-x.c index b1f2e11..d7e8c4c 100644 --- a/src/toolbar-x.c +++ b/src/toolbar-x.c @@ -224,7 +224,7 @@ x_output_toolbar_button (struct frame *f, Lisp_Object button) 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 @@ -236,11 +236,11 @@ x_output_toolbar_button (struct frame *f, Lisp_Object button) 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); -- 1.7.10.4