Mercurial > hg > xemacs-beta

comparison src/toolbar.c @ 78:c7528f8e288d r20-0b34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b34
author cvs
date Mon, 13 Aug 2007 09:05:42 +0200
parents 131b0175ea99
children 1ce6082ce73f
comparison
equal deleted inserted replaced
77:6cb4f478e7bc 78:c7528f8e288d
1667 slot_offset (struct frame, 1667 slot_offset (struct frame,
1668 toolbar_size[RIGHT_TOOLBAR]), 1668 toolbar_size[RIGHT_TOOLBAR]),
1669 toolbar_size_changed_in_frame); 1669 toolbar_size_changed_in_frame);
1670 1670
1671 /* #### this is ugly. */ 1671 /* #### this is ugly. */
1672 /* sb - even uglier to make this work without console tty support, ugh. */
1673 elt = Qnil;
1674 #ifdef HAVE_TTY
1672 elt = list1 (Fcons (list1 (Qtty), Qzero)); 1675 elt = list1 (Fcons (list1 (Qtty), Qzero));
1676 #endif
1673 #ifdef HAVE_X_WINDOWS 1677 #ifdef HAVE_X_WINDOWS
1674 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); 1678 if (elt != Qnil)
1679 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt);
1680 else
1681 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)));
1675 #endif 1682 #endif
1676 #ifdef HAVE_NEXTSTEP 1683 #ifdef HAVE_NEXTSTEP
1677 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); 1684 if (elt != Qnil)
1685 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt);
1686 else
1687 elt = list1 (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT)));
1678 #endif 1688 #endif
1679 set_specifier_fallback (Vdefault_toolbar_height, elt); 1689 if (elt != Qnil)
1690 set_specifier_fallback (Vdefault_toolbar_height, elt);
1691
1692 elt = Qnil;
1693 #ifdef HAVE_TTY
1680 elt = list1 (Fcons (list1 (Qtty), Qzero)); 1694 elt = list1 (Fcons (list1 (Qtty), Qzero));
1695 #endif
1681 #ifdef HAVE_X_WINDOWS 1696 #ifdef HAVE_X_WINDOWS
1682 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); 1697 if (elt != Qnil)
1698 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), elt);
1699 else
1700 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)));
1683 #endif 1701 #endif
1684 #ifdef HAVE_NEXTSTEP 1702 #ifdef HAVE_NEXTSTEP
1685 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); 1703 if (elt != Qnil)
1704 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH)), elt);
1705 else
1706 elt = list1 (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH)));
1686 #endif 1707 #endif
1687 set_specifier_fallback (Vdefault_toolbar_width, elt); 1708 if (elt != Qnil)
1709 set_specifier_fallback (Vdefault_toolbar_width, elt);
1688 1710
1689 set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height); 1711 set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height);
1690 elt = list1 (Fcons (Qnil, Qzero)); 1712 elt = list1 (Fcons (Qnil, Qzero));
1691 set_specifier_fallback (Vtoolbar_size[BOTTOM_TOOLBAR], elt); 1713 set_specifier_fallback (Vtoolbar_size[BOTTOM_TOOLBAR], elt);
1692 set_specifier_fallback (Vtoolbar_size[LEFT_TOOLBAR], elt); 1714 set_specifier_fallback (Vtoolbar_size[LEFT_TOOLBAR], elt);