changeset 36956:22c5aa03d4aa

(x_update_menu_appearance): Use a different path for Lucid popup menus.
author Gerd Moellmann <gerd@gnu.org>
date Fri, 23 Mar 2001 11:13:43 +0000
parents ebb6774c41db
children 0c9ff9f1d49f
files src/xfaces.c
diffstat 1 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/xfaces.c	Fri Mar 23 11:12:25 2001 +0000
+++ b/src/xfaces.c	Fri Mar 23 11:13:43 2001 +0000
@@ -4369,11 +4369,17 @@
       struct face *face = FACE_FROM_ID (f, MENU_FACE_ID);
       char *myname = XSTRING (Vx_resource_name)->data;
       int changed_p = 0;
+#ifdef USE_MOTIF
+      const char *popup_path = "popup_menu";
+#else
+      const char *popup_path = "menu.popup";
+#endif
       
       if (STRINGP (LFACE_FOREGROUND (lface)))
 	{
-	  sprintf (line, "%s.popup_menu*foreground: %s",
-		   myname, XSTRING (LFACE_FOREGROUND (lface))->data);
+	  sprintf (line, "%s.%s*foreground: %s",
+		   myname, popup_path,
+		   XSTRING (LFACE_FOREGROUND (lface))->data);
 	  XrmPutLineResource (&rdb, line);
 	  sprintf (line, "%s.pane.menubar*foreground: %s",
 		   myname, XSTRING (LFACE_FOREGROUND (lface))->data);
@@ -4383,8 +4389,9 @@
 
       if (STRINGP (LFACE_BACKGROUND (lface)))
 	{
-	  sprintf (line, "%s.popup_menu*background: %s",
-		   myname, XSTRING (LFACE_BACKGROUND (lface))->data);
+	  sprintf (line, "%s.%s*background: %s",
+		   myname, popup_path,
+		   XSTRING (LFACE_BACKGROUND (lface))->data);
 	  XrmPutLineResource (&rdb, line);
 	  sprintf (line, "%s.pane.menubar*background: %s",
 		   myname, XSTRING (LFACE_BACKGROUND (lface))->data);