Mercurial > hg > xemacs-beta

comparison src/toolbar.c @ 12:bcdc7deadc19 r19-15b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b7
author cvs
date Mon, 13 Aug 2007 08:48:16 +0200
parents ac2d302a0011
children 9ee227acff29
comparison
equal deleted inserted replaced
11:91ffe8bd52e4 12:bcdc7deadc19
1683 slot_offset (struct frame, 1683 slot_offset (struct frame,
1684 toolbar_size[RIGHT_TOOLBAR]), 1684 toolbar_size[RIGHT_TOOLBAR]),
1685 toolbar_size_changed_in_frame); 1685 toolbar_size_changed_in_frame);
1686 1686
1687 /* #### this is ugly. */ 1687 /* #### this is ugly. */
1688 /* sb - even uglier to make this work without console tty support, ugh. */
1689 elt = Qnil;
1690 #ifdef HAVE_TTY
1688 elt = list1 (Fcons (list1 (Qtty), Qzero)); 1691 elt = list1 (Fcons (list1 (Qtty), Qzero));
1692 #endif
1689 #ifdef HAVE_X_WINDOWS 1693 #ifdef HAVE_X_WINDOWS
1690 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); 1694 if (elt != Qnil)
1695 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt);
1696 else
1697 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)));
1691 #endif 1698 #endif
1692 #ifdef HAVE_NEXTSTEP 1699 #ifdef HAVE_NEXTSTEP
1693 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); 1700 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt);
1694 #endif 1701 #endif
1695 set_specifier_fallback (Vdefault_toolbar_height, elt); 1702 set_specifier_fallback (Vdefault_toolbar_height, elt);
1703
1704 elt = Qnil;
1705 #ifdef HAVE_TTY
1696 elt = list1 (Fcons (list1 (Qtty), Qzero)); 1706 elt = list1 (Fcons (list1 (Qtty), Qzero));
1707 #endif
1697 #ifdef HAVE_X_WINDOWS 1708 #ifdef HAVE_X_WINDOWS
1698 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); 1709 if (elt != Qnil)
1710 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), elt);
1711 else
1712 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)));
1699 #endif 1713 #endif
1700 #ifdef HAVE_NEXTSTEP 1714 #ifdef HAVE_NEXTSTEP
1701 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); 1715 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH)), elt);
1702 #endif 1716 #endif
1703 set_specifier_fallback (Vdefault_toolbar_width, elt); 1717 set_specifier_fallback (Vdefault_toolbar_width, elt);