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
735d63c
..
55f6c66
100644
(file)
--- a/
src/toolbar-x.c
+++ b/
src/toolbar-x.c
@@
-221,7
+221,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);
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;
Emchar_dynarr *buf;
struct font_metric_info fm;
@@
-504,9
+504,9
@@
x_output_toolbar (struct frame *f, enum toolbar_pos pos)
Lisp_Object frame;
XSETFRAME (frame, f);
Lisp_Object frame;
XSETFRAME (frame, f);
- DEVMETH (d, clear_region, (frame,
- DEFAULT_INDEX, FRAME_PIXWIDTH (f) - 1, y, 1,
- bar_height));
+ redisplay_clear_region (frame,
+ DEFAULT_INDEX, FRAME_PIXWIDTH (f) - 1, y, 1,
+ bar_height);
}
SET_TOOLBAR_WAS_VISIBLE_FLAG (f, pos, 1);
}
SET_TOOLBAR_WAS_VISIBLE_FLAG (f, pos, 1);
@@
-542,7
+542,7
@@
x_clear_toolbar (struct frame *f, enum toolbar_pos pos, int thickness_change)
SET_TOOLBAR_WAS_VISIBLE_FLAG (f, pos, 0);
SET_TOOLBAR_WAS_VISIBLE_FLAG (f, pos, 0);
- DEVMETH (d, clear_region, (frame, DEFAULT_INDEX, x, y, width, height));
+ redisplay_clear_region (frame, DEFAULT_INDEX, x, y, width, height);
XFlush (DEVICE_X_DISPLAY (d));
}
XFlush (DEVICE_X_DISPLAY (d));
}