xemacs-beta: src/objects-msw.c comparison

comparison src/objects-msw.c @ 4990:8f0cf4fd3d2c

Automatic merge

author	Ben Wing <ben@xemacs.org>
date	Sat, 06 Feb 2010 04:01:46 -0600
parents	3c3c1d139863
children	2eec7322eb7f d95c102a96d3

comparison

equal deleted inserted replaced

-:d2ec55325515
+:8f0cf4fd3d2c
 COLORREF pcolor = PALETTERGB (GetRValue (color), GetGValue (color),
 				GetBValue (color));
 for (i = 0; i < countof (mswindows_X_color_map); i++)
 if (pcolor == (mswindows_X_color_map[i].colorref))
-return  build_string (mswindows_X_color_map[i].name);
+return  build_ascstring (mswindows_X_color_map[i].name);
 sprintf (buf, "#%02X%02X%02X",
 	   GetRValue (color), GetGValue (color), GetBValue (color));
-return build_string (buf);
+return build_ascstring (buf);
 }
 /*
 * Returns non-zero if the two supplied font patterns match.
 * If they match and fontname is not NULL, copies the logical OR of the
 * 'on-the-fly' are not enumerated. It would be overly restrictive to
 * disallow Bold And Italic weights for these fonts, so we just leave
 * weights unspecified. This means that we have to weed out duplicates of
 * those fonts that do get enumerated with different weights.
 */
-TSTR_TO_C_STRING (lpelfe->elfLogFont.lfFaceName, facename);
+facename = TSTR_TO_ITEXT (lpelfe->elfLogFont.lfFaceName);
 if (itext_ichar (facename) == '@')
 /* This is a font for writing vertically. We ignore it. */
 return 1;
 if (FontType == 0 /*vector*/ || FontType & TRUETYPE_FONTTYPE)
 }
 if (i == countof (charset_map))
 return 1;
 /* Add the font name to the list if not already there */
-fontname_lispstr = build_intstring (fontname);
+fontname_lispstr = build_istring (fontname);
 if (NILP (Fassoc (fontname_lispstr, font_enum->list)))
 font_enum->list =
 Fcons (Fcons (fontname_lispstr,
 		    /* TMPF_FIXED_PITCH is backwards from what you expect!
 		       If set, it means NOT fixed pitch. */
 static void
 mswindows_finalize_color_instance (Lisp_Color_Instance *c)
 {
 if (c->data)
 {
-xfree (c->data, void *);
+xfree (c->data);
 c->data = 0;
 }
 }
 static int
 if (fields > 0 && qxestrlen (fontname))
 {
 Extbyte *extfontname;
-C_STRING_TO_TSTR (fontname, extfontname);
+extfontname = ITEXT_TO_TSTR (fontname);
 if (logfont)
 	{
 qxetcsncpy ((Extbyte *) logfont->lfFaceName, extfontname,
 	             LF_FACESIZE - 1);
 	  logfont->lfFaceName[LF_FACESIZE - 1] = 0;
 if (!parse_font_spec (truername, hdc, name_for_errors,
 			    ERROR_ME_DEBUG_WARN, &logfont, fontname, weight,
 			    points, effects, charset))
 	signal_error (Qinternal_error, "Bad value in device font list?",
-		      build_intstring (truername));
+		      build_istring (truername));
 }
 else if (!parse_font_spec (namestr, hdc, name_for_errors,
 			     errb, &logfont, fontname, weight, points,
 			     effects, charset))
 return 0;
 list of fonts.  Doesn't really matter now, since we always have one.
 See above. */
 qxesprintf (truename, "%s:%s:%s:%s:%s", fontname, weight,
 	      points, effects, charset);
-*truename_ret = build_intstring (truename);
+*truename_ret = build_istring (truename);
 return hfont;
 }
 /*
 * This is a work horse for both mswindows_initialize_font_instance and
 Ibyte *namestr = XSTRING_DATA (name);
 Lisp_Object truename;
 hfont = create_hfont_from_font_spec (namestr, hdc, name, device_font_list,
 				       errb, &truename);
+if (!hfont)
+return 0;
 f->truename = truename;
 f->data = xnew_and_zero (struct mswindows_font_instance_data);
 FONT_INSTANCE_MSWINDOWS_HFONT_VARIANT (f, 0, 0) = hfont;
 /* Some underlined fonts have the descent of one pixel more than their
 	  if (FONT_INSTANCE_MSWINDOWS_HFONT_I (f, i) != NULL
 	      && FONT_INSTANCE_MSWINDOWS_HFONT_I (f, i) != MSWINDOWS_BAD_HFONT)
 	    DeleteObject (FONT_INSTANCE_MSWINDOWS_HFONT_I (f, i));
 	}
-xfree (f->data, void *);
+xfree (f->data);
 f->data = 0;
 }
 }
 #if 0
 Ibyte fontname[MSW_FONTSIZE];
 if (match_font (XSTRING_DATA (XCAR (XCAR (fonttail))),
 		      XSTRING_DATA (pattern),
 		      fontname))
-	result = Fcons (build_intstring (fontname), result);
+	result = Fcons (build_istring (fontname), result);
 }
 return Fnreverse (result);
 }
 is contained inside of FONTSIGNATURE data, obtained by calling
 GetTextCharsetInfo on a font object, which we need to create from the
 spec.  See if the FONTSIGNATURE data is already cached.  If not, get
 it and cache it. */
 if (!STRINGP (reloc) || the_nonreloc != XSTRING_DATA (reloc))
-reloc = build_intstring (the_nonreloc);
+reloc = build_istring (the_nonreloc);
 GCPRO1 (reloc);
 fontsig = Fgethash (reloc, Vfont_signature_data, Qunbound);
 if (!UNBOUNDP (fontsig))
 {
 {
 Lisp_Object result = Qnil;
 int i;
 for (i = 0; i < countof (mswindows_X_color_map); i++)
-result = Fcons (build_string (mswindows_X_color_map[i].name), result);
+result = Fcons (build_ascstring (mswindows_X_color_map[i].name), result);
 return Fnreverse (result);
 }

Mercurial > hg > xemacs-beta

comparison src/objects-msw.c @ 4990:8f0cf4fd3d2c