summaryrefslogtreecommitdiff
path: root/src/w32term.c
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2008-06-23 12:41:50 +0000
committerJason Rumney <jasonr@gnu.org>2008-06-23 12:41:50 +0000
commit0b07ad98c5b93cc57cc7a9349eee7a6dbae4e869 (patch)
treeb4ba84958bdaf36df8b1c89bcb4a1fa6e0e5800f /src/w32term.c
parentffbda93a863b687a419b1c6453deae23e8be4829 (diff)
downloademacs-0b07ad98c5b93cc57cc7a9349eee7a6dbae4e869.tar.gz
* w32term.c (x_draw_glyph_string_background)
(x_draw_glyph_string): Remove old bdf font code. * w32term.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE): Remove.
Diffstat (limited to 'src/w32term.c')
-rw-r--r--src/w32term.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/w32term.c b/src/w32term.c
index a5f3ebaae21..770369454ed 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -54,7 +54,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "keymap.h"
#include "w32heap.h"
-#include "w32bdf.h"
#include <shellapi.h>
#include "font.h"
@@ -102,8 +101,6 @@ extern void free_frame_menubar ();
extern int w32_codepage_for_font (char *fontname);
extern Cursor w32_load_cursor (LPCTSTR name);
-extern glyph_metric *w32_BDF_TextMetric(bdffont *fontp,
- unsigned char *text, int dim);
extern Lisp_Object Vwindow_system;
#define x_any_window_to_frame x_window_to_frame
@@ -1223,7 +1220,6 @@ x_draw_glyph_string_background (s, force_p)
if (FONT_HEIGHT (s->font) < s->height - 2 * box_line_width
|| s->font_not_found_p
|| s->extends_to_end_of_line_p
- || FONT_COMPAT (s->font)->bdf
|| cleartype_active
|| force_p)
{
@@ -2346,8 +2342,7 @@ x_draw_glyph_string (s)
/* Draw strike-through. */
if (s->face->strike_through_p
- && (FONT_COMPAT (s->font)->bdf
- || !FONT_COMPAT (s->font)->tm.tmStruckOut))
+ && !FONT_COMPAT (s->font)->tm.tmStruckOut)
{
unsigned long h = 1;
unsigned long dy = (s->height - h) / 2;