Mercurial > hg > xemacs-beta
comparison lwlib/xlwmenu.c @ 365:30d2cfa1092a r21-1-12
Import from CVS: tag r21-1-12
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:00:12 +0200 |
parents | 7347b34c275b |
children | cc15677e0335 |
comparison
equal
deleted
inserted
replaced
364:63c3368d1275 | 365:30d2cfa1092a |
---|---|
86 XtRString, "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1"}, | 86 XtRString, "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1"}, |
87 #else | 87 #else |
88 {XtNfont, XtCFont, XtRFontStruct, sizeof(XFontStruct *), | 88 {XtNfont, XtCFont, XtRFontStruct, sizeof(XFontStruct *), |
89 offset(menu.font), XtRString, "XtDefaultFont"}, | 89 offset(menu.font), XtRString, "XtDefaultFont"}, |
90 # ifdef USE_XFONTSET | 90 # ifdef USE_XFONTSET |
91 /* #### Consider using the same method as for Motif; see the comment in | |
92 XlwMenuInitialize(). */ | |
91 {XtNfontSet, XtCFontSet, XtRFontSet, sizeof(XFontSet), | 93 {XtNfontSet, XtCFontSet, XtRFontSet, sizeof(XFontSet), |
92 offset(menu.font_set), XtRString, "XtDefaultFontSet"}, | 94 offset(menu.font_set), XtRString, "XtDefaultFontSet"}, |
93 # endif | 95 # endif |
94 #endif | 96 #endif |
95 {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel), | 97 {XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel), |
3007 mw->menu.gray_pixmap = | 3009 mw->menu.gray_pixmap = |
3008 XCreatePixmapFromBitmapData (display, window, (char *) gray_bits, | 3010 XCreatePixmapFromBitmapData (display, window, (char *) gray_bits, |
3009 gray_width, gray_height, 1, 0, 1); | 3011 gray_width, gray_height, 1, 0, 1); |
3010 | 3012 |
3011 #ifdef NEED_MOTIF | 3013 #ifdef NEED_MOTIF |
3014 /* #### Even if it's a kludge!!!, we should consider doing the same for | |
3015 X Font Sets. */ | |
3012 /* The menu.font_list slot came from the *fontList resource (Motif standard.) | 3016 /* The menu.font_list slot came from the *fontList resource (Motif standard.) |
3013 The menu.font_list_2 slot came from the *font resource, for backward | 3017 The menu.font_list_2 slot came from the *font resource, for backward |
3014 compatibility with older versions of this code, and consistency with the | 3018 compatibility with older versions of this code, and consistency with the |
3015 rest of emacs. If both font and fontList are specified, we use font. | 3019 rest of emacs. If both font and fontList are specified, we use fontList. |
3016 If only one is specified, we use that. If neither are specified, we | 3020 If only one is specified, we use that. If neither are specified, we |
3017 use the "fallback" value. What a kludge!!! | 3021 use the "fallback" value. What a kludge!!! |
3018 | 3022 |
3019 Note that this has the bug that a more general wildcard like "*fontList:" | 3023 Note that this has the bug that a more general wildcard like "*fontList:" |
3020 will override a more specific resource like "Emacs*menubar.font:". But | 3024 will override a more specific resource like "Emacs*menubar.font:". But |