Mercurial > hg > xemacs-beta

comparison src/device-gtk.c @ 5178:97eb4942aec8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 21:28:13 -0500
parents 8b2f75cecb89 a9c41067dd88
children 5efbd1253905
comparison
equal deleted inserted replaced
5177:b785049378e3 5178:97eb4942aec8
74 { XD_LISP_OBJECT, offsetof (struct gtk_device, WM_COMMAND_frame) }, 74 { XD_LISP_OBJECT, offsetof (struct gtk_device, WM_COMMAND_frame) },
75 { XD_END } 75 { XD_END }
76 }; 76 };
77 77
78 #ifdef NEW_GC 78 #ifdef NEW_GC
79 DEFINE_LRECORD_IMPLEMENTATION ("gtk-device", gtk_device, 79 DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT ("gtk-device", gtk_device,
80 1, /*dumpable-flag*/ 80 0, gtk_device_data_description_1,
81 0, 0, 0, 0, 0, 81 Lisp_Gtk_Device);
82 gtk_device_data_description_1,
83 Lisp_Gtk_Device);
84 #else /* not NEW_GC */ 82 #else /* not NEW_GC */
85 extern const struct sized_memory_description gtk_device_data_description; 83 extern const struct sized_memory_description gtk_device_data_description;
86 84
87 const struct sized_memory_description gtk_device_data_description = { 85 const struct sized_memory_description gtk_device_data_description = {
88 sizeof (struct gtk_device), gtk_device_data_description_1 86 sizeof (struct gtk_device), gtk_device_data_description_1
115 113
116 static void 114 static void
117 allocate_gtk_device_struct (struct device *d) 115 allocate_gtk_device_struct (struct device *d)
118 { 116 {
119 #ifdef NEW_GC 117 #ifdef NEW_GC
120 d->device_data = alloc_lrecord_type (struct gtk_device, &lrecord_gtk_device); 118 d->device_data = XGTK_DEVICE (ALLOC_NORMAL_LISP_OBJECT (gtk_device));
121 #else /* not NEW_GC */ 119 #else /* not NEW_GC */
122 d->device_data = xnew_and_zero (struct gtk_device); 120 d->device_data = xnew_and_zero (struct gtk_device);
123 #endif /* not NEW_GC */ 121 #endif /* not NEW_GC */
124 DEVICE_GTK_DATA (d)->x_keysym_map_hashtable = Qnil; 122 DEVICE_GTK_DATA (d)->x_keysym_map_hashtable = Qnil;
125 } 123 }
687 685
688 void 686 void
689 syms_of_device_gtk (void) 687 syms_of_device_gtk (void)
690 { 688 {
691 #ifdef NEW_GC 689 #ifdef NEW_GC
692 INIT_LRECORD_IMPLEMENTATION (gtk_device); 690 INIT_LISP_OBJECT (gtk_device);
693 #endif /* NEW_GC */ 691 #endif /* NEW_GC */
694 692
695 DEFSUBR (Fgtk_keysym_on_keyboard_p); 693 DEFSUBR (Fgtk_keysym_on_keyboard_p);
696 DEFSUBR (Fgtk_display_visual_class); 694 DEFSUBR (Fgtk_display_visual_class);
697 DEFSUBR (Fgtk_display_visual_depth); 695 DEFSUBR (Fgtk_display_visual_depth);