1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-23 10:34:07 +00:00

(tool-bar-mode): Make it a no-op if images

aren't supported.  This avoids the annoying grey strip drawn by
the Windows version instead of the missing tool bar.
This commit is contained in:
Eli Zaretskii 2001-08-30 06:52:19 +00:00
parent 53ca4610ef
commit ef32aa0283
2 changed files with 22 additions and 15 deletions

View File

@ -1,3 +1,9 @@
2001-08-30 Eli Zaretskii <eliz@is.elta.co.il>
* toolbar/tool-bar.el (tool-bar-mode): Make it a no-op if images
aren't supported. This avoids the annoying gray strip drawn by
the Windows version instead of the missing tool bar.
2001-08-29 Gerd Moellmann <gerd@gnu.org>
* menu-bar.el (menu-bar-options-menu): Make option text, messages

View File

@ -50,21 +50,22 @@ conveniently adding tool bar items."
:global t
:group 'mouse
:group 'frames
(let ((lines (if tool-bar-mode 1 0)))
;; Alter existing frames...
(mapc (lambda (frame)
(modify-frame-parameters frame
(list (cons 'tool-bar-lines lines))))
(frame-list))
;; ...and future ones.
(let ((elt (assq 'tool-bar-lines default-frame-alist)))
(if elt
(setcdr elt lines)
(add-to-list 'default-frame-alist (cons 'tool-bar-lines lines)))))
(if (and tool-bar-mode
(display-graphic-p)
(= 1 (length (default-value 'tool-bar-map)))) ; not yet setup
(tool-bar-setup)))
(and (display-images-p)
(let ((lines (if tool-bar-mode 1 0)))
;; Alter existing frames...
(mapc (lambda (frame)
(modify-frame-parameters frame
(list (cons 'tool-bar-lines lines))))
(frame-list))
;; ...and future ones.
(let ((elt (assq 'tool-bar-lines default-frame-alist)))
(if elt
(setcdr elt lines)
(add-to-list 'default-frame-alist (cons 'tool-bar-lines lines)))))
(if (and tool-bar-mode
(display-graphic-p)
(= 1 (length (default-value 'tool-bar-map)))) ; not yet setup
(tool-bar-setup))))
(defvar tool-bar-map (make-sparse-keymap)
"Keymap for the tool bar.