projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git-]
/
src
/
toolbar-x.c
diff --git
a/src/toolbar-x.c
b/src/toolbar-x.c
index
a8a8f0e
..
a82357a
100644
(file)
--- a/
src/toolbar-x.c
+++ b/
src/toolbar-x.c
@@
-23,6
+23,8
@@
Boston, MA 02111-1307, USA. */
/* Synched up with: Not in FSF. */
/* 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 <config.h>
#include "lisp.h"
@@
-223,8
+225,8
@@
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);
WINDOW_FACE_CACHEL (w, DEFAULT_INDEX);
struct display_line dl;
Lisp_Object string = IMAGE_INSTANCE_TEXT_STRING (p);
- unsigned char charsets[NUM_LEADING_BYTES];
- Emchar_dynarr *buf;
+ Charset_ID charsets[NUM_LEADING_BYTES];
+ Charc_dynarr *buf;
struct font_metric_info fm;
/* This could be true if we were called via the Expose event
struct font_metric_info fm;
/* This could be true if we were called via the Expose event
@@
-236,11
+238,11
@@
x_output_toolbar_button (struct frame *f, Lisp_Object button)
MARK_TOOLBAR_CHANGED;
return;
}
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);
(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);
ensure_face_cachel_complete (cachel, window, charsets);
face_cachel_charset_font_metric_info (cachel, charsets, &fm);