aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Rumney2008-05-14 14:40:57 +0000
committerJason Rumney2008-05-14 14:40:57 +0000
commite5e29349e12b31e694060c4c138464ed7e88a911 (patch)
treef8ddc89f39604d83b07989d9ccecbec44aaaee17 /src
parentbe9442ad0322d715edbe1ecad8e28ab9701288b6 (diff)
downloademacs-e5e29349e12b31e694060c4c138464ed7e88a911.tar.gz
emacs-e5e29349e12b31e694060c4c138464ed7e88a911.zip
(w32_get_glyph_overhangs): Remove.
(w32_redisplay_interface): Use x_get_glyph_overhangs instead.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32term.c16
2 files changed, 6 insertions, 15 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1b897b8403b..b365794448e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12008-05-14 Jason Rumney <jasonr@gnu.org>
2
3 * w32term.c (w32_get_glyph_overhangs): Remove.
4 (w32_redisplay_interface): Use x_get_glyph_overhangs instead.
5
12008-05-14 Kenichi Handa <handa@m17n.org> 62008-05-14 Kenichi Handa <handa@m17n.org>
2 7
3 * font.c (font_prop_validate): Make nil a valid value. 8 * font.c (font_prop_validate): Make nil a valid value.
diff --git a/src/w32term.c b/src/w32term.c
index aeab2b718e1..101b7d58f71 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1766,20 +1766,6 @@ w32_compute_glyph_string_overhangs (s)
1766 } 1766 }
1767} 1767}
1768 1768
1769
1770static void
1771w32_get_glyph_overhangs (glyph, f, left, right)
1772 struct glyph *glyph;
1773 struct frame *f;
1774 int *left, *right;
1775{
1776 HDC hdc = get_frame_dc (f);
1777 /* Convert to unicode! */
1778 x_get_glyph_overhangs (glyph, f, left, right);
1779 release_frame_dc (f, hdc);
1780}
1781
1782
1783/* Fill rectangle X, Y, W, H with background color of glyph string S. */ 1769/* Fill rectangle X, Y, W, H with background color of glyph string S. */
1784 1770
1785static INLINE void 1771static INLINE void
@@ -6837,7 +6823,7 @@ static struct redisplay_interface w32_redisplay_interface =
6837 x_flush, 6823 x_flush,
6838 0, /* flush_display_optional */ 6824 0, /* flush_display_optional */
6839 x_clear_window_mouse_face, 6825 x_clear_window_mouse_face,
6840 w32_get_glyph_overhangs, 6826 x_get_glyph_overhangs,
6841 x_fix_overlapping_area, 6827 x_fix_overlapping_area,
6842 w32_draw_fringe_bitmap, 6828 w32_draw_fringe_bitmap,
6843 w32_define_fringe_bitmap, 6829 w32_define_fringe_bitmap,