comparison src/toolbar.c @ 80:1ce6082ce73f r20-0b90

Import from CVS: tag r20-0b90
author cvs
date Mon, 13 Aug 2007 09:06:37 +0200
parents c7528f8e288d
children cca96a509cfe
comparison
equal deleted inserted replaced
79:5b0a5bbffab6 80:1ce6082ce73f
1673 elt = Qnil; 1673 elt = Qnil;
1674 #ifdef HAVE_TTY 1674 #ifdef HAVE_TTY
1675 elt = list1 (Fcons (list1 (Qtty), Qzero)); 1675 elt = list1 (Fcons (list1 (Qtty), Qzero));
1676 #endif 1676 #endif
1677 #ifdef HAVE_X_WINDOWS 1677 #ifdef HAVE_X_WINDOWS
1678 if (elt != Qnil) 1678 if (!EQ(elt, Qnil))
1679 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 1680 else
1681 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT))); 1681 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)));
1682 #endif 1682 #endif
1683 #ifdef HAVE_NEXTSTEP 1683 #ifdef HAVE_NEXTSTEP
1684 if (elt != Qnil) 1684 if (!EQ(elt, Qnil))
1685 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 1686 else
1687 elt = list1 (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT))); 1687 elt = list1 (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_HEIGHT)));
1688 #endif 1688 #endif
1689 if (elt != Qnil) 1689 if (!EQ(elt, Qnil))
1690 set_specifier_fallback (Vdefault_toolbar_height, elt); 1690 set_specifier_fallback (Vdefault_toolbar_height, elt);
1691 1691
1692 elt = Qnil; 1692 elt = Qnil;
1693 #ifdef HAVE_TTY 1693 #ifdef HAVE_TTY
1694 elt = list1 (Fcons (list1 (Qtty), Qzero)); 1694 elt = list1 (Fcons (list1 (Qtty), Qzero));
1695 #endif 1695 #endif
1696 #ifdef HAVE_X_WINDOWS 1696 #ifdef HAVE_X_WINDOWS
1697 if (elt != Qnil) 1697 if (!EQ(elt, Qnil))
1698 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 1699 else
1700 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH))); 1700 elt = list1 (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)));
1701 #endif 1701 #endif
1702 #ifdef HAVE_NEXTSTEP 1702 #ifdef HAVE_NEXTSTEP
1703 if (elt != Qnil) 1703 if (!EQ(elt, Qnil))
1704 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 1705 else
1706 elt = list1 (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH))); 1706 elt = list1 (Fcons (list1 (Qns), make_int (DEFAULT_TOOLBAR_WIDTH)));
1707 #endif 1707 #endif
1708 if (elt != Qnil) 1708 if (!EQ(elt, Qnil))
1709 set_specifier_fallback (Vdefault_toolbar_width, elt); 1709 set_specifier_fallback (Vdefault_toolbar_width, elt);
1710 1710
1711 set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height); 1711 set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height);
1712 elt = list1 (Fcons (Qnil, Qzero)); 1712 elt = list1 (Fcons (Qnil, Qzero));
1713 set_specifier_fallback (Vtoolbar_size[BOTTOM_TOOLBAR], elt); 1713 set_specifier_fallback (Vtoolbar_size[BOTTOM_TOOLBAR], elt);