Mercurial > emacs

comparison src/xfaces.c @ 60699:11723b2eac2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(x_update_menu_appearance) [HAVE_X_I18N]: Use xic_create_fontsetname even for non-Motif menus. Don't forget to free the fontsetname.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 18 Mar 2005 04:21:17 +0000
parents cffa9a821286
children 18fb43577f76 1830bcd0eec0 30ad2795fdab
comparison
equal deleted inserted replaced
60698:3e557e11645e 60699:11723b2eac2e
4690 || !UNSPECIFIEDP (LFACE_SLANT (lface)) 4690 || !UNSPECIFIEDP (LFACE_SLANT (lface))
4691 || !UNSPECIFIEDP (LFACE_HEIGHT (lface)))) 4691 || !UNSPECIFIEDP (LFACE_HEIGHT (lface))))
4692 { 4692 {
4693 #ifdef USE_MOTIF 4693 #ifdef USE_MOTIF
4694 const char *suffix = "List"; 4694 const char *suffix = "List";
4695 Bool motif = True;
4695 #else 4696 #else
4696 const char *suffix = ""; 4697 const char *suffix = "";
4698 Bool motif = False;
4697 #endif 4699 #endif
4698 #if defined HAVE_X_I18N && defined USE_MOTIF 4700 #if defined HAVE_X_I18N
4699 extern char *xic_create_fontsetname 4701 extern char *xic_create_fontsetname
4700 P_ ((char *base_fontname, Bool motif)); 4702 P_ ((char *base_fontname, Bool motif));
4701 char *fontsetname = xic_create_fontsetname (face->font_name, True); 4703 char *fontsetname = xic_create_fontsetname (face->font_name, motif);
4702 #else 4704 #else
4703 char *fontsetname = face->font_name; 4705 char *fontsetname = face->font_name;
4704 #endif 4706 #endif
4705 sprintf (line, "%s.pane.menubar*font%s: %s", 4707 sprintf (line, "%s.pane.menubar*font%s: %s",
4706 myname, suffix, fontsetname); 4708 myname, suffix, fontsetname);
4707 XrmPutLineResource (&rdb, line); 4709 XrmPutLineResource (&rdb, line);
4708 sprintf (line, "%s.%s*font%s: %s", 4710 sprintf (line, "%s.%s*font%s: %s",
4709 myname, popup_path, suffix, fontsetname); 4711 myname, popup_path, suffix, fontsetname);
4710 XrmPutLineResource (&rdb, line); 4712 XrmPutLineResource (&rdb, line);
4711 changed_p = 1; 4713 changed_p = 1;
4714 if (fontsetname != face->font_name)
4715 xfree (fontsetname);
4712 } 4716 }
4713 4717
4714 if (changed_p && f->output_data.x->menubar_widget) 4718 if (changed_p && f->output_data.x->menubar_widget)
4715 free_frame_menubar (f); 4719 free_frame_menubar (f);
4716 } 4720 }