Mercurial > hg > xemacs-beta
comparison src/toolbar.c @ 70:131b0175ea99 r20-0b30
Import from CVS: tag r20-0b30
author | cvs |
---|---|
date | Mon, 13 Aug 2007 09:02:59 +0200 |
parents | 859a2309aef8 |
children | c7528f8e288d |
comparison
equal
deleted
inserted
replaced
69:804d1389bcd6 | 70:131b0175ea99 |
---|---|
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 | |
1675 elt = list1 (Fcons (list1 (Qtty), Qzero)); | 1672 elt = list1 (Fcons (list1 (Qtty), Qzero)); |
1676 #endif | |
1677 #ifdef HAVE_X_WINDOWS | 1673 #ifdef HAVE_X_WINDOWS |
1678 if (!EQ(elt, Qnil)) | 1674 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); |
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))); | |
1682 #endif | 1675 #endif |
1683 #ifdef HAVE_NEXTSTEP | 1676 #ifdef HAVE_NEXTSTEP |
1684 if (!EQ(elt, Qnil)) | 1677 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT)), elt); |
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))); | |
1688 #endif | 1678 #endif |
1689 if (!EQ(elt, Qnil)) | 1679 set_specifier_fallback (Vdefault_toolbar_height, elt); |
1690 set_specifier_fallback (Vdefault_toolbar_height, elt); | |
1691 | |
1692 elt = Qnil; | |
1693 #ifdef HAVE_TTY | |
1694 elt = list1 (Fcons (list1 (Qtty), Qzero)); | 1680 elt = list1 (Fcons (list1 (Qtty), Qzero)); |
1695 #endif | |
1696 #ifdef HAVE_X_WINDOWS | 1681 #ifdef HAVE_X_WINDOWS |
1697 if (!EQ(elt, Qnil)) | 1682 elt = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); |
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))); | |
1701 #endif | 1683 #endif |
1702 #ifdef HAVE_NEXTSTEP | 1684 #ifdef HAVE_NEXTSTEP |
1703 if (!EQ(elt, Qnil)) | 1685 elt = Fcons (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH)), elt); |
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))); | |
1707 #endif | 1686 #endif |
1708 if (!EQ(elt, Qnil)) | 1687 set_specifier_fallback (Vdefault_toolbar_width, elt); |
1709 set_specifier_fallback (Vdefault_toolbar_width, elt); | |
1710 | 1688 |
1711 set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height); | 1689 set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height); |
1712 elt = list1 (Fcons (Qnil, Qzero)); | 1690 elt = list1 (Fcons (Qnil, Qzero)); |
1713 set_specifier_fallback (Vtoolbar_size[BOTTOM_TOOLBAR], elt); | 1691 set_specifier_fallback (Vtoolbar_size[BOTTOM_TOOLBAR], elt); |
1714 set_specifier_fallback (Vtoolbar_size[LEFT_TOOLBAR], elt); | 1692 set_specifier_fallback (Vtoolbar_size[LEFT_TOOLBAR], elt); |