Mercurial > hg > xemacs-beta

comparison src/glyphs-x.c @ 4969:cbe181529c34

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 Wed, 03 Feb 2010 21:46:21 -0600
parents 304aebb79cd3 a6c778975d7d
children 16112448d484 4aebb0131297
comparison
equal deleted inserted replaced
4968:4d35e52790f8 4969:cbe181529c34
2374 Lisp_Font_Instance *fi = 2374 Lisp_Font_Instance *fi =
2375 XFONT_INSTANCE (query_string_font (IMAGE_INSTANCE_WIDGET_TEXT (ii), 2375 XFONT_INSTANCE (query_string_font (IMAGE_INSTANCE_WIDGET_TEXT (ii),
2376 face, 2376 face,
2377 domain)); 2377 domain));
2378 XFontStruct *fs = FONT_INSTANCE_X_FONT (fi); 2378 XFontStruct *fs = FONT_INSTANCE_X_FONT (fi);
2379 #ifdef USE_XFT 2379 #ifdef HAVE_XFT
2380 XftFont *rf = FONT_INSTANCE_X_XFTFONT (fi); 2380 XftFont *rf = FONT_INSTANCE_X_XFTFONT (fi);
2381 2381
2382 if (rf) 2382 if (rf)
2383 { 2383 {
2384 /* #### What to do about Motif? */ 2384 /* #### What to do about Motif? */
2393 lw_add_widget_value_arg (wv, XmNfontList, (XtArgVal) fontList); 2393 lw_add_widget_value_arg (wv, XmNfontList, (XtArgVal) fontList);
2394 #endif 2394 #endif
2395 lw_add_widget_value_arg (wv, XtNfont, (XtArgVal) fs); 2395 lw_add_widget_value_arg (wv, XtNfont, (XtArgVal) fs);
2396 } 2396 }
2397 2397
2398 #ifdef USE_XFT 2398 #ifdef HAVE_XFT
2399 /* #### sanity check, should wrap in appropriate ERROR_CHECK macro */ 2399 /* #### sanity check, should wrap in appropriate ERROR_CHECK macro */
2400 if (!rf && !fs) 2400 if (!rf && !fs)
2401 warn_when_safe_lispobj 2401 warn_when_safe_lispobj
2402 (intern ("xft"), Qdebug, 2402 (intern ("xft"), Qdebug,
2403 Fcons (build_msg_string ("missing font in update_widget_face"), 2403 Fcons (build_msg_string ("missing font in update_widget_face"),