Mercurial > hg > xemacs-beta
diff src/ui-gtk.h @ 5118:e0db3c197671 ben-lisp-object
merge up to latest default branch, doesn't compile yet
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Sat, 26 Dec 2009 21:18:49 -0600 |
parents | db7068430402 |
children | d1247f3cc363 |
line wrap: on
line diff
--- a/src/ui-gtk.h Sat Dec 26 00:20:27 2009 -0600 +++ b/src/ui-gtk.h Sat Dec 26 21:18:49 2009 -0600 @@ -5,6 +5,22 @@ ** Created by: William M. Perry ** Copyright (c) 2000 Aventail Corporation ** +** This file is part of XEmacs. +** +** XEmacs is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License as published by the +** Free Software Foundation; either version 2, or (at your option) any +** later version. +** +** XEmacs is distributed in the hope that it will be useful, but WITHOUT +** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +** for more details. +** +** You should have received a copy of the GNU General Public License +** along with XEmacs; see the file COPYING. If not, write to +** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, +** Boston, MA 02111-1301, USA. */ */ #ifndef __UI_GTK_H__ @@ -30,7 +46,7 @@ ffi_marshalling_function marshal; } emacs_ffi_data; -DECLARE_LRECORD (emacs_ffi, emacs_ffi_data); +DECLARE_LISP_OBJECT (emacs_ffi, emacs_ffi_data); #define XFFI(x) XRECORD (x, emacs_ffi, emacs_ffi_data) #define wrap_emacs_ffi(p) wrap_record (p, emacs_ffi) @@ -45,7 +61,7 @@ Lisp_Object plist; } emacs_gtk_object_data; -DECLARE_LRECORD (emacs_gtk_object, emacs_gtk_object_data); +DECLARE_LISP_OBJECT (emacs_gtk_object, emacs_gtk_object_data); #define XGTK_OBJECT(x) XRECORD (x, emacs_gtk_object, emacs_gtk_object_data) #define wrap_emacs_gtk_object(p) wrap_record (p, emacs_gtk_object) @@ -61,7 +77,7 @@ void *object; } emacs_gtk_boxed_data; -DECLARE_LRECORD (emacs_gtk_boxed, emacs_gtk_boxed_data); +DECLARE_LISP_OBJECT (emacs_gtk_boxed, emacs_gtk_boxed_data); #define XGTK_BOXED(x) XRECORD (x, emacs_gtk_boxed, emacs_gtk_boxed_data) #define wrap_emacs_gtk_boxed(p) wrap_record (p, emacs_gtk_boxed)