Mercurial > hg > xemacs-beta

comparison src/objects-gtk.c @ 4985:358aa3bb603f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automatic merge
author Ben Wing <ben@xemacs.org>
date Fri, 05 Feb 2010 12:12:28 -0600
parents 3c3c1d139863
children
comparison
equal deleted inserted replaced
4984:f23cd0184dcf 4985:358aa3bb603f
206 gtk_valid_color_name_p (struct device *UNUSED (d), Lisp_Object color) 206 gtk_valid_color_name_p (struct device *UNUSED (d), Lisp_Object color)
207 { 207 {
208 GdkColor c; 208 GdkColor c;
209 const char *extname; 209 const char *extname;
210 210
211 TO_EXTERNAL_FORMAT (LISP_STRING, color, C_STRING_ALLOCA, extname, Qctext); 211 extname = LISP_STRING_TO_EXTERNAL (color, Qctext);
212 212
213 if (gdk_color_parse (extname, &c) != TRUE) 213 if (gdk_color_parse (extname, &c) != TRUE)
214 return(0); 214 return(0);
215 return (1); 215 return (1);
216 } 216 }
235 { 235 {
236 GdkFont *gf; 236 GdkFont *gf;
237 XFontStruct *xf; 237 XFontStruct *xf;
238 const char *extname; 238 const char *extname;
239 239
240 TO_EXTERNAL_FORMAT (LISP_STRING, f->name, C_STRING_ALLOCA, extname, Qctext); 240 extname = LISP_STRING_TO_EXTERNAL (f->name, Qctext);
241 241
242 gf = gdk_font_load (extname); 242 gf = gdk_font_load (extname);
243 243
244 if (!gf) 244 if (!gf)
245 { 245 {
381 gtk_font_list (Lisp_Object pattern, Lisp_Object UNUSED (device), 381 gtk_font_list (Lisp_Object pattern, Lisp_Object UNUSED (device),
382 Lisp_Object UNUSED (maxnumber)) 382 Lisp_Object UNUSED (maxnumber))
383 { 383 {
384 const char *patternext; 384 const char *patternext;
385 385
386 TO_EXTERNAL_FORMAT (LISP_STRING, pattern, C_STRING_ALLOCA, patternext, Qbinary); 386 patternext = LISP_STRING_TO_EXTERNAL (pattern, Qbinary);
387 387
388 return (__gtk_font_list_internal (patternext)); 388 return (__gtk_font_list_internal (patternext));
389 } 389 }
390 390
391 /* Include the charset support, shared, for the moment, with X11. */ 391 /* Include the charset support, shared, for the moment, with X11. */