(x_update_menu_appearance) [USE_MOTIF]:
Use xic_create_fontsetname to create a fontset so utf-8 locales work. (dump_realized_face): Fix warning.
This commit is contained in:
parent
c28e7ae824
commit
2defe37faf
1 changed files with 10 additions and 3 deletions
13
src/xfaces.c
13
src/xfaces.c
|
|
@ -4694,12 +4694,19 @@ x_update_menu_appearance (f)
|
|||
const char *suffix = "List";
|
||||
#else
|
||||
const char *suffix = "";
|
||||
#endif
|
||||
#if defined HAVE_X_I18N && defined USE_MOTIF
|
||||
extern char *xic_create_fontsetname
|
||||
P_ ((char *base_fontname, Bool motif));
|
||||
char *fontsetname = xic_create_fontsetname (face->font_name, True);
|
||||
#else
|
||||
char *fontsetname = face->font_name;
|
||||
#endif
|
||||
sprintf (line, "%s.pane.menubar*font%s: %s",
|
||||
myname, suffix, face->font_name);
|
||||
myname, suffix, fontsetname);
|
||||
XrmPutLineResource (&rdb, line);
|
||||
sprintf (line, "%s.%s*font%s: %s",
|
||||
myname, popup_path, suffix, face->font_name);
|
||||
myname, popup_path, suffix, fontsetname);
|
||||
XrmPutLineResource (&rdb, line);
|
||||
changed_p = 1;
|
||||
}
|
||||
|
|
@ -7765,7 +7772,7 @@ dump_realized_face (face)
|
|||
{
|
||||
fprintf (stderr, "ID: %d\n", face->id);
|
||||
#ifdef HAVE_X_WINDOWS
|
||||
fprintf (stderr, "gc: %d\n", (int) face->gc);
|
||||
fprintf (stderr, "gc: %ld\n", (long) face->gc);
|
||||
#endif
|
||||
fprintf (stderr, "foreground: 0x%lx (%s)\n",
|
||||
face->foreground,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue