From: Dave Love <fx@gnu.org>
Date: Mon, 23 Oct 2000 18:00:51 +0000 (+0000)
Subject: (tool-bar-add-item-from-menu)
X-Git-Tag: emacs-pretest-21.0.90~653
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3b6d80f1ed45a15b4a74d3a1ae41c40301bd9d56;p=emacs.git

(tool-bar-add-item-from-menu)
(tool-bar-add-item): Set foreground and background for XBM icons.
---

diff --git a/lisp/toolbar/tool-bar.el b/lisp/toolbar/tool-bar.el
index 0946cfefdea..1db709be976 100644
--- a/lisp/toolbar/tool-bar.el
+++ b/lisp/toolbar/tool-bar.el
@@ -90,14 +90,24 @@ function will try to use first ICON.xpm, ICON.pbm then ICON.xbm using
 Keybindings are made in the map `tool-bar-map'.  To define items in
 some local map, bind `tool-bar-map' with `let' around calls of this
 function."
-  (let ((image (find-image
+  (let* ((fg (face-foreground 'tool-bar))
+	 (bg (face-background 'tool-bar))
+	 (image (find-image
 		(if (display-color-p)
-		    `((:type xpm :file ,(concat icon ".xpm"))
-		      (:type pbm :file ,(concat icon ".pbm"))
-		      (:type xbm :file ,(concat icon ".xbm")))
-		  `((:type pbm :file ,(concat icon ".pbm"))
-		    (:type xbm :file ,(concat icon ".xbm"))
-		    (:type xpm :file ,(concat icon ".xpm")))))))
+		     `((:type xpm :file ,(concat icon ".xpm"))
+		       (:type pbm :file ,(concat icon ".pbm")
+		        :background ,bg
+		        :foreground ,fg)
+		       (:type xbm :file ,(concat icon ".xbm")
+		        :background ,bg
+		        :foreground ,fg))
+		   `((:type pbm :file ,(concat icon ".pbm")
+		      :background ,bg
+		      :foreground ,fg)
+		     (:type xbm :file ,(concat icon ".xbm")
+		      :background ,bg
+		      :foreground ,fg)
+		     (:type xpm :file ,(concat icon ".xpm")))))))
     (when image
       (unless (image-mask-p image)
 	(setq image (append image '(:mask heuristic))))
@@ -120,13 +130,23 @@ function."
     (setq map global-map))
   (let* ((menu-bar-map (lookup-key map [menu-bar]))
 	 (keys (where-is-internal command menu-bar-map))
+	 (fg (face-foreground 'tool-bar))
+	 (bg (face-background 'tool-bar))
 	 (image (find-image
 		 (if (display-color-p)
 		     `((:type xpm :file ,(concat icon ".xpm"))
-		       (:type pbm :file ,(concat icon ".pbm"))
-		       (:type xbm :file ,(concat icon ".xbm")))
-		   `((:type pbm :file ,(concat icon ".pbm"))
-		     (:type xbm :file ,(concat icon ".xbm"))
+		       (:type pbm :file ,(concat icon ".pbm")
+		        :background ,bg
+		        :foreground ,fg)
+		       (:type xbm :file ,(concat icon ".xbm")
+		        :background ,bg
+		        :foreground ,fg))
+		   `((:type pbm :file ,(concat icon ".pbm")
+		      :background ,bg
+		      :foreground ,fg)
+		     (:type xbm :file ,(concat icon ".xbm")
+		      :background ,bg
+		      :foreground ,fg)
 		     (:type xpm :file ,(concat icon ".xpm"))))))
 	 submap key)
     (when image