changeset 33929:886f1ee076bd

(w32_load_system_font): Always mark font as double byte if codepage is unicode.
author Jason Rumney <jasonr@gnu.org>
date Mon, 27 Nov 2000 20:09:44 +0000
parents 3110b576fe24
children 283bc01938a1
files src/w32fns.c
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/w32fns.c	Mon Nov 27 20:06:42 2000 +0000
+++ b/src/w32fns.c	Mon Nov 27 20:09:44 2000 +0000
@@ -5537,11 +5537,17 @@
       {
 	HDC hdc;
 	HANDLE oldobj;
+        int codepage = w32_codepage_for_font (fontname);
 
 	hdc = GetDC (dpyinfo->root_window);
 	oldobj = SelectObject (hdc, font->hfont);
+
 	ok = GetTextMetrics (hdc, &font->tm);
-        font->double_byte_p = GetFontLanguageInfo(hdc) & GCP_DBCS;
+        if (codepage == CP_UNICODE)
+          font->double_byte_p = 1;
+        else
+          font->double_byte_p = GetFontLanguageInfo(hdc) & GCP_DBCS;
+
 	SelectObject (hdc, oldobj);
 	ReleaseDC (dpyinfo->root_window, hdc);
         /* Fill out details in lf according to the font that was