Mercurial > emacs

comparison src/xdisp.c @ 109566:d03bc4a3fced

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add tool bar style text-image-horiz (text to the left of the image). * lisp/cus-start.el (tool-bar-style): Add text-image-horiz. * src/gtkutil.c (xg_make_tool_item, xg_show_toolbar_item): Handle tool bar style text_image_horiz. * src/lisp.h (Qtext_image_horiz): Declare. * src/xdisp.c (Qtext_image_horiz): Define. (syms_of_xdisp): Initialize Qtext_image_horiz. Add text-image-horiz to ducumentation of tool-bar-style. * src/xsettings.c (Ftool_bar_get_system_style): Also check for Qtext_image_horiz.
author Jan D. <jan.h.d@swipnet.se>
date Wed, 28 Jul 2010 19:34:51 +0200
parents 05e7e7c46ff0
children 228a5fa4eda0
comparison
equal deleted inserted replaced
109565:c8ed2af278ee 109566:d03bc4a3fced
454 /* The image map types. */ 454 /* The image map types. */
455 Lisp_Object QCmap, QCpointer; 455 Lisp_Object QCmap, QCpointer;
456 Lisp_Object Qrect, Qcircle, Qpoly; 456 Lisp_Object Qrect, Qcircle, Qpoly;
457 457
458 /* Tool bar styles */ 458 /* Tool bar styles */
459 Lisp_Object Qtext, Qboth, Qboth_horiz; 459 Lisp_Object Qtext, Qboth, Qboth_horiz, Qtext_image_horiz;
460 460
461 /* Non-zero means print newline to stdout before next mini-buffer 461 /* Non-zero means print newline to stdout before next mini-buffer
462 message. */ 462 message. */
463 463
464 int noninteractive_need_newline; 464 int noninteractive_need_newline;
25634 staticpro (&Qtext); 25634 staticpro (&Qtext);
25635 Qboth = intern_c_string ("both"); 25635 Qboth = intern_c_string ("both");
25636 staticpro (&Qboth); 25636 staticpro (&Qboth);
25637 Qboth_horiz = intern_c_string ("both-horiz"); 25637 Qboth_horiz = intern_c_string ("both-horiz");
25638 staticpro (&Qboth_horiz); 25638 staticpro (&Qboth_horiz);
25639 Qtext_image_horiz = intern_c_string ("text-image-horiz");
25640 staticpro (&Qtext_image_horiz);
25639 QCmap = intern_c_string (":map"); 25641 QCmap = intern_c_string (":map");
25640 staticpro (&QCmap); 25642 staticpro (&QCmap);
25641 QCpointer = intern_c_string (":pointer"); 25643 QCpointer = intern_c_string (":pointer");
25642 staticpro (&QCpointer); 25644 staticpro (&QCpointer);
25643 Qrect = intern_c_string ("rect"); 25645 Qrect = intern_c_string ("rect");
25977 tool_bar_button_relief = DEFAULT_TOOL_BAR_BUTTON_RELIEF; 25979 tool_bar_button_relief = DEFAULT_TOOL_BAR_BUTTON_RELIEF;
25978 25980
25979 DEFVAR_LISP ("tool-bar-style", &Vtool_bar_style, 25981 DEFVAR_LISP ("tool-bar-style", &Vtool_bar_style,
25980 doc: /* *Tool bar style to use. 25982 doc: /* *Tool bar style to use.
25981 It can be one of 25983 It can be one of
25982 image - show images only 25984 image - show images only
25983 text - show text only 25985 text - show text only
25984 both - show both, text under image 25986 both - show both, text below image
25985 both-horiz - show text to the right of the image 25987 both-horiz - show text to the right of the image
25986 any other - use system default or image if no system default. */); 25988 text-image-horiz - show text to the left of the image
25989 any other - use system default or image if no system default. */);
25987 Vtool_bar_style = Qnil; 25990 Vtool_bar_style = Qnil;
25988 25991
25989 DEFVAR_INT ("tool-bar-max-label-size", &tool_bar_max_label_size, 25992 DEFVAR_INT ("tool-bar-max-label-size", &tool_bar_max_label_size,
25990 doc: /* *Maximum number of characters a label can have to be shown. 25993 doc: /* *Maximum number of characters a label can have to be shown.
25991 The tool bar style must also show labels for this to have any effect, see 25994 The tool bar style must also show labels for this to have any effect, see