aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-03-23 11:13:43 +0000
committerGerd Moellmann2001-03-23 11:13:43 +0000
commit8ad582ac65a2b00e2cabb86aa20c2a066880b32d (patch)
treea003a85df155b4909b197319d4a4d2d558ca9fc4 /src
parentd3a785fff56bb784c1cdb1413e64331979c79614 (diff)
downloademacs-8ad582ac65a2b00e2cabb86aa20c2a066880b32d.tar.gz
emacs-8ad582ac65a2b00e2cabb86aa20c2a066880b32d.zip
(x_update_menu_appearance): Use a different path
for Lucid popup menus.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 346774791fa..8e0fdc21727 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -4369,11 +4369,17 @@ x_update_menu_appearance (f)
4369 struct face *face = FACE_FROM_ID (f, MENU_FACE_ID); 4369 struct face *face = FACE_FROM_ID (f, MENU_FACE_ID);
4370 char *myname = XSTRING (Vx_resource_name)->data; 4370 char *myname = XSTRING (Vx_resource_name)->data;
4371 int changed_p = 0; 4371 int changed_p = 0;
4372#ifdef USE_MOTIF
4373 const char *popup_path = "popup_menu";
4374#else
4375 const char *popup_path = "menu.popup";
4376#endif
4372 4377
4373 if (STRINGP (LFACE_FOREGROUND (lface))) 4378 if (STRINGP (LFACE_FOREGROUND (lface)))
4374 { 4379 {
4375 sprintf (line, "%s.popup_menu*foreground: %s", 4380 sprintf (line, "%s.%s*foreground: %s",
4376 myname, XSTRING (LFACE_FOREGROUND (lface))->data); 4381 myname, popup_path,
4382 XSTRING (LFACE_FOREGROUND (lface))->data);
4377 XrmPutLineResource (&rdb, line); 4383 XrmPutLineResource (&rdb, line);
4378 sprintf (line, "%s.pane.menubar*foreground: %s", 4384 sprintf (line, "%s.pane.menubar*foreground: %s",
4379 myname, XSTRING (LFACE_FOREGROUND (lface))->data); 4385 myname, XSTRING (LFACE_FOREGROUND (lface))->data);
@@ -4383,8 +4389,9 @@ x_update_menu_appearance (f)
4383 4389
4384 if (STRINGP (LFACE_BACKGROUND (lface))) 4390 if (STRINGP (LFACE_BACKGROUND (lface)))
4385 { 4391 {
4386 sprintf (line, "%s.popup_menu*background: %s", 4392 sprintf (line, "%s.%s*background: %s",
4387 myname, XSTRING (LFACE_BACKGROUND (lface))->data); 4393 myname, popup_path,
4394 XSTRING (LFACE_BACKGROUND (lface))->data);
4388 XrmPutLineResource (&rdb, line); 4395 XrmPutLineResource (&rdb, line);
4389 sprintf (line, "%s.pane.menubar*background: %s", 4396 sprintf (line, "%s.pane.menubar*background: %s",
4390 myname, XSTRING (LFACE_BACKGROUND (lface))->data); 4397 myname, XSTRING (LFACE_BACKGROUND (lface))->data);