Mercurial > hg > xemacs-beta
comparison src/toolbar.c @ 284:558f606b08ae r21-0b40
Import from CVS: tag r21-0b40
author | cvs |
---|---|
date | Mon, 13 Aug 2007 10:34:13 +0200 |
parents | c42ec1d1cded |
children | 57709be46d1b |
comparison
equal
deleted
inserted
replaced
283:fa3d41851a08 | 284:558f606b08ae |
---|---|
775 || !EQ (FRAME_TOOLBAR_BUFFER (f, TOP_TOOLBAR), buffer) | 775 || !EQ (FRAME_TOOLBAR_BUFFER (f, TOP_TOOLBAR), buffer) |
776 || !EQ (FRAME_TOOLBAR_BUFFER (f, BOTTOM_TOOLBAR), buffer) | 776 || !EQ (FRAME_TOOLBAR_BUFFER (f, BOTTOM_TOOLBAR), buffer) |
777 || !EQ (FRAME_TOOLBAR_BUFFER (f, LEFT_TOOLBAR), buffer) | 777 || !EQ (FRAME_TOOLBAR_BUFFER (f, LEFT_TOOLBAR), buffer) |
778 || !EQ (FRAME_TOOLBAR_BUFFER (f, RIGHT_TOOLBAR), buffer))) | 778 || !EQ (FRAME_TOOLBAR_BUFFER (f, RIGHT_TOOLBAR), buffer))) |
779 { | 779 { |
780 int width, height; | |
781 | |
782 /* We're not officially "in redisplay", so we still have a chance | |
783 to re-layout toolbars and windows. This is done here, because | |
784 toolbar is the only thing which currently might necesseritate | |
785 this layout, as it is outside any windows */ | |
786 pixel_to_char_size (f, FRAME_PIXWIDTH (f), FRAME_PIXHEIGHT (f), | |
787 &width, &height); | |
788 change_frame_size (f, height, width, 0); | |
789 | |
780 /* Removed the check for the minibuffer here. We handle this | 790 /* Removed the check for the minibuffer here. We handle this |
781 more correctly now by consistently using | 791 more correctly now by consistently using |
782 FRAME_LAST_NONMINIBUF_WINDOW instead of FRAME_SELECTED_WINDOW | 792 FRAME_LAST_NONMINIBUF_WINDOW instead of FRAME_SELECTED_WINDOW |
783 throughout the toolbar code. */ | 793 throughout the toolbar code. */ |
784 compute_frame_toolbars_data (f, 0); | 794 compute_frame_toolbars_data (f, 0); |