Mercurial > hg > xemacs-beta

comparison src/ui-gtk.c @ 797:776fcda0ee36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-29 13:51:37 by wmperry] Use wrap_emacs_* instead of wrap_* for gtk_boxed, gtk_object, and ffi LispObjects.
author wmperry
date Fri, 29 Mar 2002 13:51:50 +0000
parents e38acbeb1cae
children a5954632b187
comparison
equal deleted inserted replaced
796:7a6013500383 797:776fcda0ee36
657 data->n_args = n_args; 657 data->n_args = n_args;
658 data->function_name = name; 658 data->function_name = name;
659 data->function_ptr = name_func; 659 data->function_ptr = name_func;
660 data->marshal = marshaller_func; 660 data->marshal = marshaller_func;
661 661
662 rval = wrap_ffi (data); 662 rval = wrap_emacs_ffi (data);
663 return (rval); 663 return (rval);
664 } 664 }
665 665
666 DEFUN ("gtk-call-function", Fgtk_call_function, 1, 2, 0, /* 666 DEFUN ("gtk-call-function", Fgtk_call_function, 1, 2, 0, /*
667 Call an external function. 667 Call an external function.
906 { 906 {
907 emacs_gtk_object_data *data = (emacs_gtk_object_data *) header; 907 emacs_gtk_object_data *data = (emacs_gtk_object_data *) header;
908 908
909 if (for_disksave) 909 if (for_disksave)
910 { 910 {
911 Lisp_Object obj = wrap_gtk_object (data); 911 Lisp_Object obj = wrap_emacs_gtk_object (data);
912 912
913 913
914 invalid_operation 914 invalid_operation
915 ("Can't dump an emacs containing GtkObject objects", obj); 915 ("Can't dump an emacs containing GtkObject objects", obj);
916 } 916 }
975 { 975 {
976 data = allocate_emacs_gtk_object_data (); 976 data = allocate_emacs_gtk_object_data ();
977 977
978 data->object = obj; 978 data->object = obj;
979 data->alive_p = TRUE; 979 data->alive_p = TRUE;
980 retval = wrap_gtk_object (data); 980 retval = wrap_emacs_gtk_object (data);
981 981
982 id = new_gui_id (); 982 id = new_gui_id ();
983 gtk_object_set_data (obj, "xemacs::gui_id", (gpointer) id); 983 gtk_object_set_data (obj, "xemacs::gui_id", (gpointer) id);
984 gcpro_popup_callbacks (id, retval); 984 gcpro_popup_callbacks (id, retval);
985 gtk_object_ref (obj); 985 gtk_object_ref (obj);
1163 1163
1164 data = allocate_emacs_gtk_boxed_data (); 1164 data = allocate_emacs_gtk_boxed_data ();
1165 data->object = obj; 1165 data->object = obj;
1166 data->object_type = t; 1166 data->object_type = t;
1167 1167
1168 retval = wrap_gtk_boxed (data); 1168 retval = wrap_emacs_gtk_boxed (data);
1169 1169
1170 return (retval); 1170 return (retval);
1171 } 1171 }
1172 1172
1173 1173