Mercurial > hg > xemacs-beta

comparison src/frame-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
2604 2604
2605 #ifdef HAVE_CDE 2605 #ifdef HAVE_CDE
2606 DtDndDropUnregister (FRAME_X_TEXT_WIDGET (f)); 2606 DtDndDropUnregister (FRAME_X_TEXT_WIDGET (f));
2607 #endif /* HAVE_CDE */ 2607 #endif /* HAVE_CDE */
2608 2608
2609 #ifdef USE_XFT 2609 #ifdef HAVE_XFT
2610 /* If we have an XftDraw structure, we need to free it here. 2610 /* If we have an XftDraw structure, we need to free it here.
2611 We can't ever have an XftDraw without a Display, so we are safe 2611 We can't ever have an XftDraw without a Display, so we are safe
2612 to free it in here, and we avoid too much playing around with the 2612 to free it in here, and we avoid too much playing around with the
2613 malloc checking hooks this way. */ 2613 malloc checking hooks this way. */
2614 if (FRAME_X_XFTDRAW (f)) 2614 if (FRAME_X_XFTDRAW (f))
2711 What does XtSetValues() do if that resource isn't present? */ 2711 What does XtSetValues() do if that resource isn't present? */
2712 if (!EQ (font, Vthe_null_font_instance)) 2712 if (!EQ (font, Vthe_null_font_instance))
2713 { 2713 {
2714 if (0) 2714 if (0)
2715 ; 2715 ;
2716 #ifdef USE_XFT 2716 #ifdef HAVE_XFT
2717 else if (FONT_INSTANCE_X_XFTFONT (XFONT_INSTANCE (font))) 2717 else if (FONT_INSTANCE_X_XFTFONT (XFONT_INSTANCE (font)))
2718 { 2718 {
2719 Xt_SET_ARG (al[ac], XtNxftFont, 2719 Xt_SET_ARG (al[ac], XtNxftFont,
2720 (void *) FONT_INSTANCE_X_XFTFONT (XFONT_INSTANCE (font))); 2720 (void *) FONT_INSTANCE_X_XFTFONT (XFONT_INSTANCE (font)));
2721 ac++; 2721 ac++;