Mercurial > hg > xemacs-beta

comparison src/toolbar-x.c @ 5495:1f0b15040456

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 01 May 2011 18:44:03 +0100
parents 308d34e9f07d
children
comparison
equal deleted inserted replaced
5494:861f2601a38b 5495:1f0b15040456
4 Copyright (C) 1995, 1996 Ben Wing. 4 Copyright (C) 1995, 1996 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
10 under the terms of the GNU General Public License as published by the 10 under the terms of the GNU General Public License as published by the
11 Free Software Foundation; either version 2, or (at your option) any 11 Free Software Foundation, either version 3 of the License, or (at your
12 later version. 12 option) any later version.
13 13
14 XEmacs is distributed in the hope that it will be useful, but WITHOUT 14 XEmacs is distributed in the hope that it will be useful, but WITHOUT
15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
17 for more details. 17 for more details.
18 18
19 You should have received a copy of the GNU General Public License 19 You should have received a copy of the GNU General Public License
20 along with XEmacs; see the file COPYING. If not, write to 20 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */
21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22 Boston, MA 02111-1307, USA. */
23 21
24 /* Synched up with: Not in FSF. */ 22 /* Synched up with: Not in FSF. */
25 23
26 /* This file Mule-ized (more like Mule-verified) by Ben Wing, 7-8-00. */ 24 /* This file Mule-ized (more like Mule-verified) by Ben Wing, 7-8-00. */
27 25
35 33
36 #include "toolbar-xlike.h" 34 #include "toolbar-xlike.h"
37 35
38 #include "console-x-impl.h" 36 #include "console-x-impl.h"
39 #include "glyphs-x.h" 37 #include "glyphs-x.h"
40 #include "objects-x.h" 38 #include "fontcolor-x.h"
41 39
42 #include "EmacsFrame.h" 40 #include "EmacsFrame.h"
43 #include "EmacsFrameP.h" 41 #include "EmacsFrameP.h"
44 42
45 /* We should really create a 'xlike' console type and fill it with 43 /* We should really create a 'xlike' console type and fill it with