Mercurial > hg > xemacs-beta
diff lwlib/xlwmenu.c @ 3685:382b11fa8866
[xemacs-hg @ 2006-11-17 02:50:22 by stephent]
Fix breakage in xftFont resource for tabs and menubar.
<877ixuiy0n.fsf@uwakimon.sk.tsukuba.ac.jp>
| author | stephent |
|---|---|
| date | Fri, 17 Nov 2006 02:50:32 +0000 |
| parents | 6c7605dfcf07 |
| children | 03f6627a2e09 |
line wrap: on
line diff
--- a/lwlib/xlwmenu.c Thu Nov 16 22:51:09 2006 +0000 +++ b/lwlib/xlwmenu.c Fri Nov 17 02:50:32 2006 +0000 @@ -95,11 +95,11 @@ #ifdef USE_XFT_MENUBARS {XtNfcFontName, XtCFcFontName, XtRString, sizeof (String), offset(menu.fcFontName), - XtRString, (XtPointer) "Helvetica-12:bold"}, + XtRString, (XtPointer) NULL}, /* #### This needs to be fixed to give a proper type and converter for XftFonts. See also xlwtabs.c. */ - {XtNxftFont, XtCXftFont, XtRPointer, sizeof(XtPointer), - offset(menu.renderFont), XtRPointer, (XtPointer) NULL }, + {XtNxftFont, XtCXftFont, XtRString, sizeof(XtPointer), + offset(menu.xftFontName), XtRString, (XtPointer) "Helvetica-12:bold" }, #endif # ifdef USE_XFONTSET /* #### Consider using the same method as for Motif; see the comment in @@ -3241,6 +3241,9 @@ #endif #ifdef USE_XFT_MENUBARS + /* #### kludge for name change */ + if (!mw->menu.fcFontName) + mw->menu.fcFontName = mw->menu.xftFontName; /* to do this right, we should add a new Xt Resource type + conversion function */