comparison 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
comparison
equal deleted inserted replaced
5117:3742ea8250b5 5118:e0db3c197671
3 ** Description: 3 ** Description:
4 ** 4 **
5 ** Created by: William M. Perry 5 ** Created by: William M. Perry
6 ** Copyright (c) 2000 Aventail Corporation 6 ** Copyright (c) 2000 Aventail Corporation
7 ** 7 **
8 ** This file is part of XEmacs.
9 **
10 ** XEmacs is free software; you can redistribute it and/or modify it
11 ** under the terms of the GNU General Public License as published by the
12 ** Free Software Foundation; either version 2, or (at your option) any
13 ** later version.
14 **
15 ** XEmacs is distributed in the hope that it will be useful, but WITHOUT
16 ** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
17 ** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
18 ** for more details.
19 **
20 ** You should have received a copy of the GNU General Public License
21 ** along with XEmacs; see the file COPYING. If not, write to
22 ** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
23 ** Boston, MA 02111-1301, USA. */
8 */ 24 */
9 25
10 #ifndef __UI_GTK_H__ 26 #ifndef __UI_GTK_H__
11 #define __UI_GTK_H__ 27 #define __UI_GTK_H__
12 28
28 Lisp_Object function_name; 44 Lisp_Object function_name;
29 dll_func function_ptr; 45 dll_func function_ptr;
30 ffi_marshalling_function marshal; 46 ffi_marshalling_function marshal;
31 } emacs_ffi_data; 47 } emacs_ffi_data;
32 48
33 DECLARE_LRECORD (emacs_ffi, emacs_ffi_data); 49 DECLARE_LISP_OBJECT (emacs_ffi, emacs_ffi_data);
34 50
35 #define XFFI(x) XRECORD (x, emacs_ffi, emacs_ffi_data) 51 #define XFFI(x) XRECORD (x, emacs_ffi, emacs_ffi_data)
36 #define wrap_emacs_ffi(p) wrap_record (p, emacs_ffi) 52 #define wrap_emacs_ffi(p) wrap_record (p, emacs_ffi)
37 #define FFIP(x) RECORDP (x, emacs_ffi) 53 #define FFIP(x) RECORDP (x, emacs_ffi)
38 #define CHECK_FFI(x) CHECK_RECORD (x, emacs_ffi) 54 #define CHECK_FFI(x) CHECK_RECORD (x, emacs_ffi)
43 gboolean alive_p; 59 gboolean alive_p;
44 GtkObject *object; 60 GtkObject *object;
45 Lisp_Object plist; 61 Lisp_Object plist;
46 } emacs_gtk_object_data; 62 } emacs_gtk_object_data;
47 63
48 DECLARE_LRECORD (emacs_gtk_object, emacs_gtk_object_data); 64 DECLARE_LISP_OBJECT (emacs_gtk_object, emacs_gtk_object_data);
49 65
50 #define XGTK_OBJECT(x) XRECORD (x, emacs_gtk_object, emacs_gtk_object_data) 66 #define XGTK_OBJECT(x) XRECORD (x, emacs_gtk_object, emacs_gtk_object_data)
51 #define wrap_emacs_gtk_object(p) wrap_record (p, emacs_gtk_object) 67 #define wrap_emacs_gtk_object(p) wrap_record (p, emacs_gtk_object)
52 #define GTK_OBJECTP(x) RECORDP (x, emacs_gtk_object) 68 #define GTK_OBJECTP(x) RECORDP (x, emacs_gtk_object)
53 #define CHECK_GTK_OBJECT(x) CHECK_RECORD (x, emacs_gtk_object) 69 #define CHECK_GTK_OBJECT(x) CHECK_RECORD (x, emacs_gtk_object)
59 struct LCRECORD_HEADER header; 75 struct LCRECORD_HEADER header;
60 GtkType object_type; 76 GtkType object_type;
61 void *object; 77 void *object;
62 } emacs_gtk_boxed_data; 78 } emacs_gtk_boxed_data;
63 79
64 DECLARE_LRECORD (emacs_gtk_boxed, emacs_gtk_boxed_data); 80 DECLARE_LISP_OBJECT (emacs_gtk_boxed, emacs_gtk_boxed_data);
65 81
66 #define XGTK_BOXED(x) XRECORD (x, emacs_gtk_boxed, emacs_gtk_boxed_data) 82 #define XGTK_BOXED(x) XRECORD (x, emacs_gtk_boxed, emacs_gtk_boxed_data)
67 #define wrap_emacs_gtk_boxed(p) wrap_record (p, emacs_gtk_boxed) 83 #define wrap_emacs_gtk_boxed(p) wrap_record (p, emacs_gtk_boxed)
68 #define GTK_BOXEDP(x) RECORDP (x, emacs_gtk_boxed) 84 #define GTK_BOXEDP(x) RECORDP (x, emacs_gtk_boxed)
69 #define CHECK_GTK_BOXED(x) CHECK_RECORD (x, emacs_gtk_boxed) 85 #define CHECK_GTK_BOXED(x) CHECK_RECORD (x, emacs_gtk_boxed)