diff options
| author | Jason Rumney <jasonr@gnu.org> | 2008-06-26 10:48:28 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2008-06-26 10:48:28 +0000 |
| commit | 1b5defe6580487f499c0af4a598ee968c5cae062 (patch) | |
| tree | fda3244a1c6bcaac61eda98d5429d2d6599ddb57 /src/w32font.h | |
| parent | dc018447584eecaf2de92eef2ec3c9f60c5f818f (diff) | |
| download | emacs-1b5defe6580487f499c0af4a598ee968c5cae062.tar.gz | |
* w32bdf.c, w32bdf.h: Remove obsolete files.
* makefile.w32-in: Remove refs to w32bdf.h and w32bdf.c.
* w32gui.h: Don't include w32bdf.h.
(XCharStruct, enum w32_char_font_type, W32FontStruct):
Remove obsolete font support.
* w32font.h (struct w32font_info): Remove compat_w32_font.
Add hfont member.
(FONT_COMPAT): Remove obsolete macro.
* w32font.c (w32font_close): Remove compat code. Delete hfont member.
(w32font_encode_char, w32font_text_extents): Use new hfont member.
(w32font_open_internal): Remove compat code. Set new hfont member.
(Fx_select_font): Use new hfont member.
* w32uniscribe.c (uniscribe_otf_capability, uniscribe_shape):
(uniscribe_encode_char): Use new hfont member.
* w32term.c (x_draw_glyph_string_foreground):
(x_draw_composite_glyph_string_foreground): Use new hfont member.
(x_draw_glyph_string): Use metrics in w32font_info.
Diffstat (limited to 'src/w32font.h')
| -rw-r--r-- | src/w32font.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/w32font.h b/src/w32font.h index 60ac62d6e01..30b6ed34271 100644 --- a/src/w32font.h +++ b/src/w32font.h @@ -53,11 +53,9 @@ struct w32font_info unsigned int glyph_idx; struct w32_metric_cache **cached_metrics; int n_cache_blocks; - W32FontStruct *compat_w32_font; + HFONT hfont; }; -#define FONT_COMPAT(f) (((struct w32font_info *) (f))->compat_w32_font) - #define CACHE_BLOCKSIZE 128 Lisp_Object w32font_get_cache P_ ((FRAME_PTR fe)); |