Mercurial > hg > xemacs-beta

comparison src/toolbar.c @ 400:a86b2b5e0111 r21-2-30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-30
author cvs
date Mon, 13 Aug 2007 11:14:34 +0200
parents 74fd4e045ea6
children b8cc9ab3f761
comparison
equal deleted inserted replaced
399:376370fb5946 400:a86b2b5e0111
720 } 720 }
721 721
722 static void 722 static void
723 compute_frame_toolbars_data (struct frame *f) 723 compute_frame_toolbars_data (struct frame *f)
724 { 724 {
725 set_frame_toolbar (f, TOP_TOOLBAR); 725 set_frame_toolbar (f, TOP_TOOLBAR);
726 set_frame_toolbar (f, BOTTOM_TOOLBAR); 726 set_frame_toolbar (f, BOTTOM_TOOLBAR);
727 set_frame_toolbar (f, LEFT_TOOLBAR); 727 set_frame_toolbar (f, LEFT_TOOLBAR);
728 set_frame_toolbar (f, RIGHT_TOOLBAR); 728 set_frame_toolbar (f, RIGHT_TOOLBAR);
729 } 729 }
730 730
731 void 731 void
732 update_frame_toolbars (struct frame *f) 732 update_frame_toolbars (struct frame *f)
733 { 733 {
735 735
736 if (DEVICE_SUPPORTS_TOOLBARS_P (d) 736 if (DEVICE_SUPPORTS_TOOLBARS_P (d)
737 && (f->toolbar_changed || f->frame_changed || f->clear)) 737 && (f->toolbar_changed || f->frame_changed || f->clear))
738 { 738 {
739 int pos; 739 int pos;
740 740
741 /* We're not officially "in redisplay", so we still have a 741 /* We're not officially "in redisplay", so we still have a
742 chance to re-layout toolbars and windows. This is done here, 742 chance to re-layout toolbars and windows. This is done here,
743 because toolbar is the only thing which currently might 743 because toolbar is the only thing which currently might
744 necessitate this layout, as it is outside any windows. We 744 necessitate this layout, as it is outside any windows. We
745 take care not to change size if toolbar geometry is really 745 take care not to change size if toolbar geometry is really
1270 1270
1271 1271
1272 void 1272 void
1273 syms_of_toolbar (void) 1273 syms_of_toolbar (void)
1274 { 1274 {
1275 INIT_LRECORD_IMPLEMENTATION (toolbar_button);
1276
1275 defsymbol (&Qtoolbar_buttonp, "toolbar-button-p"); 1277 defsymbol (&Qtoolbar_buttonp, "toolbar-button-p");
1276 defsymbol (&Q2D, "2D"); 1278 defsymbol (&Q2D, "2D");
1277 defsymbol (&Q3D, "3D"); 1279 defsymbol (&Q3D, "3D");
1278 defsymbol (&Q2d, "2d"); 1280 defsymbol (&Q2d, "2d");
1279 defsymbol (&Q3d, "3d"); 1281 defsymbol (&Q3d, "3d");
1631 #endif 1633 #endif
1632 #ifdef HAVE_X_WINDOWS 1634 #ifdef HAVE_X_WINDOWS
1633 fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), fb); 1635 fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_HEIGHT)), fb);
1634 #endif 1636 #endif
1635 #ifdef HAVE_MS_WINDOWS 1637 #ifdef HAVE_MS_WINDOWS
1636 fb = Fcons (Fcons (list1 (Qmswindows), 1638 fb = Fcons (Fcons (list1 (Qmswindows),
1637 make_int (MSWINDOWS_DEFAULT_TOOLBAR_HEIGHT)), fb); 1639 make_int (MSWINDOWS_DEFAULT_TOOLBAR_HEIGHT)), fb);
1638 #endif 1640 #endif
1639 if (!NILP (fb)) 1641 if (!NILP (fb))
1640 set_specifier_fallback (Vdefault_toolbar_height, fb); 1642 set_specifier_fallback (Vdefault_toolbar_height, fb);
1641 1643
1645 #endif 1647 #endif
1646 #ifdef HAVE_X_WINDOWS 1648 #ifdef HAVE_X_WINDOWS
1647 fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), fb); 1649 fb = Fcons (Fcons (list1 (Qx), make_int (DEFAULT_TOOLBAR_WIDTH)), fb);
1648 #endif 1650 #endif
1649 #ifdef HAVE_MS_WINDOWS 1651 #ifdef HAVE_MS_WINDOWS
1650 fb = Fcons (Fcons (list1 (Qmswindows), 1652 fb = Fcons (Fcons (list1 (Qmswindows),
1651 make_int (MSWINDOWS_DEFAULT_TOOLBAR_WIDTH)), fb); 1653 make_int (MSWINDOWS_DEFAULT_TOOLBAR_WIDTH)), fb);
1652 #endif 1654 #endif
1653 if (!NILP (fb)) 1655 if (!NILP (fb))
1654 set_specifier_fallback (Vdefault_toolbar_width, fb); 1656 set_specifier_fallback (Vdefault_toolbar_width, fb);
1655 1657