Mercurial > hg > xemacs-beta

comparison src/toolbar.c @ 5126:2a462149bd6a ben-lisp-object

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Wed, 24 Feb 2010 19:04:27 -0600
parents 623d57b7fbe8 d0c14ea98592
children a9c41067dd88
comparison
equal deleted inserted replaced
5125:b5df3737028a 5126:2a462149bd6a
1 /* Generic toolbar implementation. 1 /* Generic toolbar implementation.
2 Copyright (C) 1995 Board of Trustees, University of Illinois. 2 Copyright (C) 1995 Board of Trustees, University of Illinois.
3 Copyright (C) 1995 Sun Microsystems, Inc. 3 Copyright (C) 1995 Sun Microsystems, Inc.
4 Copyright (C) 1995, 1996, 2003, 2004 Ben Wing. 4 Copyright (C) 1995, 1996, 2003, 2004, 2010 Ben Wing.
5 Copyright (C) 1996 Chuck Thompson. 5 Copyright (C) 1996 Chuck Thompson.
6 6
7 This file is part of XEmacs. 7 This file is part of XEmacs.
8 8
9 XEmacs is free software; you can redistribute it and/or modify it 9 XEmacs is free software; you can redistribute it and/or modify it
775 compute_frame_toolbars_data (f); 775 compute_frame_toolbars_data (f);
776 776
777 if (frame_size_changed) 777 if (frame_size_changed)
778 { 778 {
779 int width, height; 779 int width, height;
780 if (!window_system_pixelated_geometry (wrap_frame (f))) 780 pixel_to_frame_unit_size (f, FRAME_PIXWIDTH (f), FRAME_PIXHEIGHT (f),
781 pixel_to_char_size (f, FRAME_PIXWIDTH (f), FRAME_PIXHEIGHT (f), 781 &width, &height);
782 &width, &height); 782 internal_set_frame_size (f, width, height, 0);
783 else
784 width = FRAME_PIXWIDTH (f), height = FRAME_PIXHEIGHT (f);
785 if (!HAS_FRAMEMETH_P (f, set_frame_size))
786 change_frame_size (f, height, width, 0);
787 else
788 FRAMEMETH (f, set_frame_size, (f, width, height));
789 MARK_FRAME_LAYOUT_CHANGED (f); 783 MARK_FRAME_LAYOUT_CHANGED (f);
790 } 784 }
791 785
792 /* Clear the previous toolbar locations. If we do it later 786 /* Clear the previous toolbar locations. If we do it later
793 (after redisplay) we end up clearing what we have just 787 (after redisplay) we end up clearing what we have just