comparison src/w32fns.c @ 95218:0f6fa3ec70b6

* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp. * dosfns.c, fileio.c, font.c, fontset.c, image.c, macfns.c: * macterm.c, process.c, w32.c, w32fns.c, w32proc.c, xfaces.c: * xfns.c, xfont.c: Callers changed.
author Jason Rumney <jasonr@gnu.org>
date Thu, 22 May 2008 14:53:48 +0000
parents 4b6526b6c53a
children b2d851c43596
comparison
equal deleted inserted replaced
95217:cb71cb48eb66 95218:0f6fa3ec70b6
4991 x_to_w32_weight (lpw) 4991 x_to_w32_weight (lpw)
4992 char * lpw; 4992 char * lpw;
4993 { 4993 {
4994 if (!lpw) return (FW_DONTCARE); 4994 if (!lpw) return (FW_DONTCARE);
4995 4995
4996 if (stricmp (lpw, "heavy") == 0) return FW_HEAVY; 4996 if (xstrcasecmp (lpw, "heavy") == 0) return FW_HEAVY;
4997 else if (stricmp (lpw, "extrabold") == 0) return FW_EXTRABOLD; 4997 else if (xstrcasecmp (lpw, "extrabold") == 0) return FW_EXTRABOLD;
4998 else if (stricmp (lpw, "bold") == 0) return FW_BOLD; 4998 else if (xstrcasecmp (lpw, "bold") == 0) return FW_BOLD;
4999 else if (stricmp (lpw, "demibold") == 0) return FW_SEMIBOLD; 4999 else if (xstrcasecmp (lpw, "demibold") == 0) return FW_SEMIBOLD;
5000 else if (stricmp (lpw, "semibold") == 0) return FW_SEMIBOLD; 5000 else if (xstrcasecmp (lpw, "semibold") == 0) return FW_SEMIBOLD;
5001 else if (stricmp (lpw, "medium") == 0) return FW_MEDIUM; 5001 else if (xstrcasecmp (lpw, "medium") == 0) return FW_MEDIUM;
5002 else if (stricmp (lpw, "normal") == 0) return FW_NORMAL; 5002 else if (xstrcasecmp (lpw, "normal") == 0) return FW_NORMAL;
5003 else if (stricmp (lpw, "light") == 0) return FW_LIGHT; 5003 else if (xstrcasecmp (lpw, "light") == 0) return FW_LIGHT;
5004 else if (stricmp (lpw, "extralight") == 0) return FW_EXTRALIGHT; 5004 else if (xstrcasecmp (lpw, "extralight") == 0) return FW_EXTRALIGHT;
5005 else if (stricmp (lpw, "thin") == 0) return FW_THIN; 5005 else if (xstrcasecmp (lpw, "thin") == 0) return FW_THIN;
5006 else 5006 else
5007 return FW_DONTCARE; 5007 return FW_DONTCARE;
5008 } 5008 }
5009 5009
5010 5010
5055 this_entry = Fassoc (build_string (charset), Vw32_charset_info_alist); 5055 this_entry = Fassoc (build_string (charset), Vw32_charset_info_alist);
5056 5056
5057 if (NILP (this_entry)) 5057 if (NILP (this_entry))
5058 { 5058 {
5059 /* At startup, we want iso8859-1 fonts to come up properly. */ 5059 /* At startup, we want iso8859-1 fonts to come up properly. */
5060 if (stricmp (charset, "iso8859-1") == 0) 5060 if (xstrcasecmp (charset, "iso8859-1") == 0)
5061 return ANSI_CHARSET; 5061 return ANSI_CHARSET;
5062 else 5062 else
5063 return DEFAULT_CHARSET; 5063 return DEFAULT_CHARSET;
5064 } 5064 }
5065 5065
6481 6481
6482 pfi = FRAME_W32_FONT_TABLE (f); 6482 pfi = FRAME_W32_FONT_TABLE (f);
6483 6483
6484 for (i = 0; i < one_w32_display_info.n_fonts ;i++, pfi++) 6484 for (i = 0; i < one_w32_display_info.n_fonts ;i++, pfi++)
6485 { 6485 {
6486 if (stricmp (pfi->name, fontname) == 0) return pfi; 6486 if (xstrcasecmp (pfi->name, fontname) == 0) return pfi;
6487 } 6487 }
6488 6488
6489 return NULL; 6489 return NULL;
6490 } 6490 }
6491 6491