User: stephent Date: 05/02/25 18:17:48 Modified: xemacs/src Tag: carbon2 ChangeLog console-carbon-impl.h console-carbon.c device-carbon.c event-carbon.c frame-carbon.c glyphs-carbon.c glyphs-carbon.h glyphs.c intl-carbon.c menubar-carbon.c objects-carbon-impl.h objects-carbon.c redisplay-carbon.c scrollbar-carbon.c select-carbon.c toolbar-carbon.c Log: wrap permissions notices and #include provided xpm.h Revision Changes Path No revision No revision 1.750.2.1 +21 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.750 retrieving revision 1.750.2.1 diff -u -r1.750 -r1.750.2.1 --- ChangeLog 2004/10/22 05:19:17 1.750 +++ ChangeLog 2005/02/25 17:17:39 1.750.2.1 ＠＠ -1,3 +1,24 ＠＠ +2005-02-26 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * glyphs.c: #include provided xpm.h #ifdef HAVE_CARBON. + + * console-carbon-impl.h: + * console-carbon.c: + * device-carbon.c: + * event-carbon.c: + * frame-carbon.c: + * glyphs-carbon.c: + * glyphs-carbon.h: + * intl-carbon.c: + * menubar-carbon.c: + * objects-carbon-impl.h: + * objects-carbon.c: + * redisplay-carbon.c: + * scrollbar-carbon.c: + * select-carbon.c: + * toolbar-carbon.c: + Wrap permissions notices. + 2004-10-22 Stephen J. Turnbull <stephen(a)xemacs.org&gt; * XEmacs 21.5.18 "chestnut" is released. 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/console-carbon-impl.h Index: console-carbon-impl.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/console-carbon-impl.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- console-carbon-impl.h 2005/02/25 16:29:56 1.1.2.1 +++ console-carbon-impl.h 2005/02/25 17:17:41 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #ifndef INCLUDED_console_carbon_impl_h_ #define INCLUDED_console_carbon_impl_h_ 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/console-carbon.c Index: console-carbon.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/console-carbon.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- console-carbon.c 2005/02/25 16:29:57 1.1.2.1 +++ console-carbon.c 2005/02/25 17:17:41 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #include <config.h> #include "lisp.h" 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/device-carbon.c Index: device-carbon.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/device-carbon.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- device-carbon.c 2005/02/25 16:29:58 1.1.2.1 +++ device-carbon.c 2005/02/25 17:17:41 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #include <config.h> #include "lisp.h" 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/event-carbon.c Index: event-carbon.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/event-carbon.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- event-carbon.c 2005/02/25 16:29:59 1.1.2.1 +++ event-carbon.c 2005/02/25 17:17:41 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #include <config.h> #include "lisp.h" 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/frame-carbon.c Index: frame-carbon.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/frame-carbon.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- frame-carbon.c 2005/02/25 16:30:01 1.1.2.1 +++ frame-carbon.c 2005/02/25 17:17:41 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #include <config.h> #include "lisp.h" 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/glyphs-carbon.c Index: glyphs-carbon.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/glyphs-carbon.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- glyphs-carbon.c 2005/02/25 16:30:02 1.1.2.1 +++ glyphs-carbon.c 2005/02/25 17:17:42 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #include <config.h> #include "lisp.h" 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/glyphs-carbon.h Index: glyphs-carbon.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/glyphs-carbon.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- glyphs-carbon.h 2005/02/25 16:30:03 1.1.2.1 +++ glyphs-carbon.h 2005/02/25 17:17:42 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #ifndef INCLUDED_glyphs_carbon_h_ #define INCLUDED_glyphs_carbon_h_ 1.47.2.1 +6 -1 XEmacs/xemacs/src/glyphs.c Index: glyphs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs.c,v retrieving revision 1.47 retrieving revision 1.47.2.1 diff -u -r1.47 -r1.47.2.1 --- glyphs.c 2004/09/22 02:06:48 1.47 +++ glyphs.c 2005/02/25 17:17:42 1.47.2.1 ＠＠ -49,8 +49,13 ＠＠ #include "sysfile.h" -#if defined (HAVE_XPM) && !defined (HAVE_GTK) +#if defined (HAVE_XPM) +#if defined (HAVE_CARBON) +#include "../carbon/xpm/xpm.h" +void *XpmFree (void *ptr); /* local Xpm is missing this */ +#elif !defined (HAVE_GTK) #include <X11/xpm.h> +#endif #endif Lisp_Object Qimage_conversion_error; 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/intl-carbon.c Index: intl-carbon.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/intl-carbon.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- intl-carbon.c 2005/02/25 16:30:04 1.1.2.1 +++ intl-carbon.c 2005/02/25 17:17:42 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #include <config.h> #include "lisp.h" 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/menubar-carbon.c Index: menubar-carbon.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/menubar-carbon.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- menubar-carbon.c 2005/02/25 16:30:04 1.1.2.1 +++ menubar-carbon.c 2005/02/25 17:17:42 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #include <config.h> #include "lisp.h" 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/objects-carbon-impl.h Index: objects-carbon-impl.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/objects-carbon-impl.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- objects-carbon-impl.h 2005/02/25 16:30:05 1.1.2.1 +++ objects-carbon-impl.h 2005/02/25 17:17:43 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #ifndef INCLUDED_objects_carbon_impl_h_ #define INCLUDED_objects_carbon_impl_h_ 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/objects-carbon.c Index: objects-carbon.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/objects-carbon.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- objects-carbon.c 2005/02/25 16:30:05 1.1.2.1 +++ objects-carbon.c 2005/02/25 17:17:43 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #include <config.h> #include "lisp.h" 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/redisplay-carbon.c Index: redisplay-carbon.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/redisplay-carbon.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- redisplay-carbon.c 2005/02/25 16:30:06 1.1.2.1 +++ redisplay-carbon.c 2005/02/25 17:17:43 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #include <config.h> #include "lisp.h" 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/scrollbar-carbon.c Index: scrollbar-carbon.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/scrollbar-carbon.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- scrollbar-carbon.c 2005/02/25 16:30:07 1.1.2.1 +++ scrollbar-carbon.c 2005/02/25 17:17:43 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #include <config.h> #include "lisp.h" 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/select-carbon.c Index: select-carbon.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/select-carbon.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- select-carbon.c 2005/02/25 16:30:07 1.1.2.1 +++ select-carbon.c 2005/02/25 17:17:43 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #include <config.h> #include "lisp.h" 1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/toolbar-carbon.c Index: toolbar-carbon.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/toolbar-carbon.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- toolbar-carbon.c 2005/02/25 16:30:09 1.1.2.1 +++ toolbar-carbon.c 2005/02/25 17:17:44 1.1.2.2 ＠＠ -1,9 +1,22 ＠＠ /* + This file is part of XEmacs, a work distributed under the terms of the + GNU General Public License. It contains code by Andrew Choi, with the + original permissions notice: + The following code is original work by me, except where noted with the comments "Taken from ..." or "Adapted from ...". I now place it in the public domain. - Andrew Choi. Calgary, Canada, February 9, 2005. */ + Andrew Choi. Calgary, Canada, February 9, 2005. + + Nevertheless, under the terms of the GNU GPL, we may distribute this file + with XEmacs only by relicensing it under the GNU GPL, and you are bound by + those terms. We're sorry for this double-talk, but we're afraid it is + necessary. Andrew Choi's code is available unencumbered by the GPL at + + http://members.shaw.ca/akochoi-xemacs/diff/ + ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/ +*/ #include <config.h> #include "lisp.h"