comparison lwlib/xlwmenu.c @ 185:3d6bfa290dbd r20-3b19

Import from CVS: tag r20-3b19
author cvs
date Mon, 13 Aug 2007 09:55:28 +0200
parents e121b013d1f0
children f53b5ca2e663
comparison
equal deleted inserted replaced
184:bcd2674570bf 185:3d6bfa290dbd
2790 passed to XFontsOfFontSet. Use XmFontListNextEntry(), which is the 2790 passed to XFontsOfFontSet. Use XmFontListNextEntry(), which is the
2791 newer equivalent, instead. Also, it supports font sets, and the 2791 newer equivalent, instead. Also, it supports font sets, and the
2792 older function doesn't. */ 2792 older function doesn't. */
2793 while ((fontentry = XmFontListNextEntry (context))) 2793 while ((fontentry = XmFontListNextEntry (context)))
2794 { 2794 {
2795 char *one_of_them;
2796 XmFontType rettype; 2795 XmFontType rettype;
2797 2796
2798 one_of_them = XmFontListEntryGetFont (fontentry, &rettype); 2797 XtPointer one_of_them = XmFontListEntryGetFont (fontentry, &rettype);
2799 if (rettype == XmFONT_IS_FONTSET) 2798 if (rettype == XmFONT_IS_FONTSET)
2800 { 2799 {
2801 XFontSet fontset = (XFontSet) one_of_them; 2800 XFontSet fontset = (XFontSet) one_of_them;
2802 XFontStruct **fontstruct_list; 2801 XFontStruct **fontstruct_list;
2803 char **fontname_list; 2802 char **fontname_list;
2871 { 2870 {
2872 XmFontContext context; 2871 XmFontContext context;
2873 #if (XmVersion >= 1002) 2872 #if (XmVersion >= 1002)
2874 XmFontListEntry fontentry; 2873 XmFontListEntry fontentry;
2875 XmFontType rettype; 2874 XmFontType rettype;
2876 char *one_of_them; 2875 XtPointer one_of_them;
2877 #else 2876 #else
2878 XmStringCharSet charset; 2877 XmStringCharSet charset;
2879 #endif 2878 #endif
2880 2879
2881 if (! XmFontListInitFontContext (&context, font_list)) 2880 if (! XmFontListInitFontContext (&context, font_list))