Mercurial > hg > xemacs-beta

comparison src/ui-gtk.c @ 3017:1e7cc382eb16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2005-10-24 10:07:26 by ben] refactor mc-alloc dependencies next-error.el, occur.el: Fix some byte-compile warnings. alloc.c, buffer.c, buffer.h, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, console-impl.h, console-msw-impl.h, console.c, data.c, database.c, device-impl.h, device-msw.c, device.c, dialog-msw.c, elhash.c, events.h, extents-impl.h, extents.c, faces.c, faces.h, file-coding.c, file-coding.h, frame-impl.h, frame.c, glyphs.c, glyphs.h, gui.c, gui.h, keymap.c, lisp.h, lrecord.h, lstream.c, lstream.h, mule-charset.c, objects-impl.h, objects.c, opaque.c, opaque.h, print.c, process.c, procimpl.h, rangetab.c, rangetab.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, specifier.c, specifier.h, symbols.c, symeval.h, toolbar.c, toolbar.h, tooltalk.c, ui-gtk.c, ui-gtk.h, unicode.c, window-impl.h, window.c: Eliminate the majority of #ifdef MC_ALLOC occurrences through macros LCRECORD_HEADER, ALLOC_LCRECORD_TYPE, MALLOCED_STORAGE_SIZE, etc. (defined in lrecord.h).
author ben
date Mon, 24 Oct 2005 10:07:42 +0000
parents 6fa9919a9a0b
children db7068430402 3742ea8250b5
comparison
equal deleted inserted replaced
3016:f252275fb013 3017:1e7cc382eb16
278 278
279 /* Foreign function calls */ 279 /* Foreign function calls */
280 static emacs_ffi_data * 280 static emacs_ffi_data *
281 allocate_ffi_data (void) 281 allocate_ffi_data (void)
282 { 282 {
283 #ifdef MC_ALLOC 283 emacs_ffi_data *data = ALLOC_LCRECORD_TYPE (emacs_ffi_data, &lrecord_emacs_ffi);
284 emacs_ffi_data *data = alloc_lrecord_type (emacs_ffi_data, &lrecord_emacs_ffi);
285 #else /* not MC_ALLOC */
286 emacs_ffi_data *data = alloc_lcrecord_type (emacs_ffi_data, &lrecord_emacs_ffi);
287 #endif /* not MC_ALLOC */
288 284
289 data->return_type = GTK_TYPE_NONE; 285 data->return_type = GTK_TYPE_NONE;
290 data->n_args = 0; 286 data->n_args = 0;
291 data->function_name = Qnil; 287 data->function_name = Qnil;
292 data->function_ptr = 0; 288 data->function_ptr = 0;
946 emacs_gtk_object_data); 942 emacs_gtk_object_data);
947 943
948 static emacs_gtk_object_data * 944 static emacs_gtk_object_data *
949 allocate_emacs_gtk_object_data (void) 945 allocate_emacs_gtk_object_data (void)
950 { 946 {
951 #ifdef MC_ALLOC 947 emacs_gtk_object_data *data = ALLOC_LCRECORD_TYPE (emacs_gtk_object_data,
952 emacs_gtk_object_data *data = alloc_lrecord_type (emacs_gtk_object_data,
953 &lrecord_emacs_gtk_object);
954 #else /* not MC_ALLOC */
955 emacs_gtk_object_data *data = alloc_lcrecord_type (emacs_gtk_object_data,
956 &lrecord_emacs_gtk_object); 948 &lrecord_emacs_gtk_object);
957 #endif /* not MC_ALLOC */
958 949
959 data->object = NULL; 950 data->object = NULL;
960 data->alive_p = FALSE; 951 data->alive_p = FALSE;
961 data->plist = Qnil; 952 data->plist = Qnil;
962 953
1160 GdkColor - 1151 GdkColor -
1161 */ 1152 */
1162 static emacs_gtk_boxed_data * 1153 static emacs_gtk_boxed_data *
1163 allocate_emacs_gtk_boxed_data (void) 1154 allocate_emacs_gtk_boxed_data (void)
1164 { 1155 {
1165 #ifdef MC_ALLOC 1156 emacs_gtk_boxed_data *data = ALLOC_LCRECORD_TYPE (emacs_gtk_boxed_data,
1166 emacs_gtk_boxed_data *data = alloc_lrecord_type (emacs_gtk_boxed_data,
1167 &lrecord_emacs_gtk_boxed);
1168 #else /* not MC_ALLOC */
1169 emacs_gtk_boxed_data *data = alloc_lcrecord_type (emacs_gtk_boxed_data,
1170 &lrecord_emacs_gtk_boxed); 1157 &lrecord_emacs_gtk_boxed);
1171 #endif /* not MC_ALLOC */
1172 1158
1173 data->object = NULL; 1159 data->object = NULL;
1174 data->object_type = GTK_TYPE_INVALID; 1160 data->object_type = GTK_TYPE_INVALID;
1175 1161
1176 return (data); 1162 return (data);