comparison src/ui-gtk.c @ 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 3742ea8250b5 db7068430402
children 623d57b7fbe8
comparison
equal deleted inserted replaced
5117:3742ea8250b5 5118:e0db3c197671
3 ** Description: Creating 'real' UIs from lisp. 3 ** Description: Creating 'real' UIs from lisp.
4 ** 4 **
5 ** Created by: William M. Perry <wmperry@gnu.org> 5 ** Created by: William M. Perry <wmperry@gnu.org>
6 ** Copyright (c) 2000 William M. Perry <wmperry@gnu.org> 6 ** Copyright (c) 2000 William M. Perry <wmperry@gnu.org>
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 #include <config.h> 26 #include <config.h>
11 #include "lisp.h" 27 #include "lisp.h"
12 28
317 if (XFFI (obj)->n_args) 333 if (XFFI (obj)->n_args)
318 write_fmt_string (printcharfun, " %d arguments", XFFI (obj)->n_args); 334 write_fmt_string (printcharfun, " %d arguments", XFFI (obj)->n_args);
319 write_fmt_string (printcharfun, " %p>", (void *)XFFI (obj)->function_ptr); 335 write_fmt_string (printcharfun, " %p>", (void *)XFFI (obj)->function_ptr);
320 } 336 }
321 337
322 DEFINE_NONDUMPABLE_LISP_OBJECT ("ffi", emacs_ffi, 338 DEFINE_NODUMP_LISP_OBJECT ("ffi", emacs_ffi,
323 mark_ffi_data, ffi_object_printer, 339 mark_ffi_data, ffi_object_printer,
324 0, 0, 0, 340 0, 0, 0,
325 ffi_data_description, emacs_ffi_data); 341 ffi_data_description, emacs_ffi_data);
326 342
327 #if defined (__cplusplus) 343 #if defined (__cplusplus)
925 { 941 {
926 gtk_object_unref (data->object); 942 gtk_object_unref (data->object);
927 } 943 }
928 } 944 }
929 945
930 DEFINE_NONDUMPABLE_LISP_OBJECT_WITH_PROPS ("GtkObject", emacs_gtk_object, 946 DEFINE_NODUMP_LISP_OBJECT_WITH_PROPS ("GtkObject", emacs_gtk_object,
931 mark_gtk_object_data, 947 mark_gtk_object_data,
932 emacs_gtk_object_printer, 948 emacs_gtk_object_printer,
933 emacs_gtk_object_finalizer, 949 emacs_gtk_object_finalizer,
934 0, /* equality */ 950 0, /* equality */
935 0, /* hash */ 951 0, /* hash */
1120 { 1136 {
1121 emacs_gtk_boxed_data *data = XGTK_BOXED(obj); 1137 emacs_gtk_boxed_data *data = XGTK_BOXED(obj);
1122 return (HASH2 ((Hashcode) data->object, data->object_type)); 1138 return (HASH2 ((Hashcode) data->object, data->object_type));
1123 } 1139 }
1124 1140
1125 DEFINE_NONDUMPABLE_LISP_OBJECT_WITH_PROPS ("GtkBoxed", emacs_gtk_boxed, 1141 DEFINE_NODUMP_LISP_OBJECT_WITH_PROPS ("GtkBoxed", emacs_gtk_boxed,
1126 0, /* marker function */ 1142 0, /* marker function */
1127 emacs_gtk_boxed_printer, 1143 emacs_gtk_boxed_printer,
1128 0, /* nuker */ 1144 0, /* nuker */
1129 emacs_gtk_boxed_equality, 1145 emacs_gtk_boxed_equality,
1130 emacs_gtk_boxed_hash, 1146 emacs_gtk_boxed_hash,