comparison src/toolbar.c @ 276:6330739388db r21-0b36

Import from CVS: tag r21-0b36
author cvs
date Mon, 13 Aug 2007 10:30:37 +0200
parents c5d627a313b1
children 7df0dd720c89
comparison
equal deleted inserted replaced
275:a68ae4439f57 276:6330739388db
1731 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb); 1731 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb);
1732 #endif 1732 #endif
1733 #ifdef HAVE_X_WINDOWS 1733 #ifdef HAVE_X_WINDOWS
1734 fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), fb); 1734 fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), fb);
1735 #endif 1735 #endif
1736 #ifdef HAVE_MS_WINDOWS
1737 fb = Fcons (Fcons (list1 (Qmswindows),
1738 make_int (MSWINDOWS_DEFAULT_TOOLBAR_HEIGHT)), fb);
1739 #endif
1736 if (!NILP (fb)) 1740 if (!NILP (fb))
1737 set_specifier_fallback (Vdefault_toolbar_height, fb); 1741 set_specifier_fallback (Vdefault_toolbar_height, fb);
1738 1742
1739 fb = Qnil; 1743 fb = Qnil;
1740 #ifdef HAVE_TTY 1744 #ifdef HAVE_TTY
1741 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb); 1745 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb);
1742 #endif 1746 #endif
1743 #ifdef HAVE_X_WINDOWS 1747 #ifdef HAVE_X_WINDOWS
1744 fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), fb); 1748 fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), fb);
1749 #endif
1750 #ifdef HAVE_MS_WINDOWS
1751 fb = Fcons (Fcons (list1 (Qmswindows),
1752 make_int (MSWINDOWS_DEFAULT_TOOLBAR_WIDTH)), fb);
1745 #endif 1753 #endif
1746 if (!NILP (fb)) 1754 if (!NILP (fb))
1747 set_specifier_fallback (Vdefault_toolbar_width, fb); 1755 set_specifier_fallback (Vdefault_toolbar_width, fb);
1748 1756
1749 set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height); 1757 set_specifier_fallback (Vtoolbar_size[TOP_TOOLBAR], Vdefault_toolbar_height);
1851 #ifdef HAVE_TTY 1859 #ifdef HAVE_TTY
1852 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb); 1860 fb = Fcons (Fcons (list1 (Qtty), Qzero), fb);
1853 #endif 1861 #endif
1854 #ifdef HAVE_X_WINDOWS 1862 #ifdef HAVE_X_WINDOWS
1855 fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_BORDER_WIDTH)), fb); 1863 fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_BORDER_WIDTH)), fb);
1864 #endif
1865 #ifdef HAVE_MS_WINDOWS
1866 fb = Fcons (Fcons (list1 (Qmswindows), make_int (MSWINDOWS_DEFAULT_TOOLBAR_BORDER_WIDTH)), fb);
1856 #endif 1867 #endif
1857 if (!NILP (fb)) 1868 if (!NILP (fb))
1858 set_specifier_fallback (Vdefault_toolbar_border_width, fb); 1869 set_specifier_fallback (Vdefault_toolbar_border_width, fb);
1859 1870
1860 set_specifier_fallback (Vtoolbar_border_width[TOP_TOOLBAR], Vdefault_toolbar_border_width); 1871 set_specifier_fallback (Vtoolbar_border_width[TOP_TOOLBAR], Vdefault_toolbar_border_width);