Commit 2b4e6277 authored by Jan D's avatar Jan D
Browse files

Fix handling of tool-bar-position, also put into default-frame-alist.

* lisp/menu-bar.el (menu-bar-set-tool-bar-position): New function.
(menu-bar-showhide-tool-bar-menu-customize-enable-left)
(menu-bar-showhide-tool-bar-menu-customize-enable-right)
(menu-bar-showhide-tool-bar-menu-customize-enable-top)
(menu-bar-showhide-tool-bar-menu-customize-enable-bottom): Call
menu-bar-set-tool-bar-position.

* src/frame.h (Qtool_bar_position): Declare.

* src/xfns.c (Fx_create_frame): Call x_default_parameter for
Qtool_bar_position.
parent 9dec0f76
2010-08-13 Jan Djärv <jan.h.d@swipnet.se>
* menu-bar.el (menu-bar-set-tool-bar-position): New function.
(menu-bar-showhide-tool-bar-menu-customize-enable-left)
(menu-bar-showhide-tool-bar-menu-customize-enable-right)
(menu-bar-showhide-tool-bar-menu-customize-enable-top)
(menu-bar-showhide-tool-bar-menu-customize-enable-bottom): Call
menu-bar-set-tool-bar-position.
2010-08-12 Stefan Monnier <monnier@iro.umontreal.ca>
 
* progmodes/octave-mod.el (octave-mode-syntax-table): Use the new "c"
......
......@@ -968,6 +968,14 @@ mail status in mode line"))
:help ,(purecopy "Turn menu-bar on/off")
:button (:toggle . (> (frame-parameter nil 'menu-bar-lines) 0))))
(defun menu-bar-set-tool-bar-position (position)
(customize-set-variable 'tool-bar-mode t)
(set-frame-parameter nil 'tool-bar-position position)
(customize-set-variable 'default-frame-alist
(cons (cons 'tool-bar-position position)
(assq-delete-all 'tool-bar-position
default-frame-alist))))
(defun menu-bar-showhide-tool-bar-menu-customize-disable ()
"Do not display tool bars."
(interactive)
......@@ -975,24 +983,20 @@ mail status in mode line"))
(defun menu-bar-showhide-tool-bar-menu-customize-enable-left ()
"Display tool bars on the left side."
(interactive)
(customize-set-variable 'tool-bar-mode t)
(set-frame-parameter nil 'tool-bar-position 'left))
(menu-bar-set-tool-bar-position 'left))
(defun menu-bar-showhide-tool-bar-menu-customize-enable-right ()
"Display tool bars on the right side."
(interactive)
(customize-set-variable 'tool-bar-mode t)
(set-frame-parameter nil 'tool-bar-position 'right))
(menu-bar-set-tool-bar-position 'right))
(defun menu-bar-showhide-tool-bar-menu-customize-enable-top ()
"Display tool bars on the top side."
(interactive)
(customize-set-variable 'tool-bar-mode t)
(set-frame-parameter nil 'tool-bar-position 'top))
(menu-bar-set-tool-bar-position 'top))
(defun menu-bar-showhide-tool-bar-menu-customize-enable-bottom ()
"Display tool bars on the bottom side."
(interactive)
(customize-set-variable 'tool-bar-mode t)
(set-frame-parameter nil 'tool-bar-position 'bottom))
(menu-bar-set-tool-bar-position 'bottom))
(if (featurep 'move-toolbar)
(progn
......
2010-08-13 Jan Djärv <jan.h.d@swipnet.se>
* frame.h (Qtool_bar_position): Declare.
* xfns.c (Fx_create_frame): Call x_default_parameter for
Qtool_bar_position.
2010-08-13 Eli Zaretskii <eliz@gnu.org>
 
* unexcoff.c: Remove the parts used when "emacs" is not defined.
......
......@@ -1050,7 +1050,7 @@ extern Lisp_Object Qbackground_color, Qforeground_color;
extern Lisp_Object Qicon, Qicon_name, Qicon_type, Qicon_left, Qicon_top;
extern Lisp_Object Qinternal_border_width;
extern Lisp_Object Qtooltip;
extern Lisp_Object Qmenu_bar_lines, Qtool_bar_lines;
extern Lisp_Object Qmenu_bar_lines, Qtool_bar_lines, Qtool_bar_position;
extern Lisp_Object Qmouse_color;
extern Lisp_Object Qname, Qtitle;
extern Lisp_Object Qparent_id;
......
......@@ -3392,6 +3392,8 @@ This function is an internal primitive--use `make-frame' instead. */)
"waitForWM", "WaitForWM", RES_TYPE_BOOLEAN);
x_default_parameter (f, parms, Qfullscreen, Qnil,
"fullscreen", "Fullscreen", RES_TYPE_SYMBOL);
x_default_parameter (f, parms, Qtool_bar_position,
f->tool_bar_position, 0, 0, RES_TYPE_SYMBOL);
/* Compute the size of the X window. */
window_prompting = x_figure_window_size (f, parms, 1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment