diff options
author | Tim Janik <timj@gtk.org> | 1998-06-09 07:11:55 +0000 |
---|---|---|
committer | Tim Janik <timj@src.gnome.org> | 1998-06-09 07:11:55 +0000 |
commit | a21d063ef867d0df151872f79cb04db8e730c42a (patch) | |
tree | 4e39ac11c98f2da3e38430d09843f6c74e007b07 /gtk/gtksignal.c | |
parent | 257c54a0210d75fd17d19d555a90c52a07693ef4 (diff) | |
download | gtk+-a21d063ef867d0df151872f79cb04db8e730c42a.tar.gz |
new functions gtk_selection_data_copy and gtk_selection_data_free.
Tue Jun 9 01:57:23 1998 Tim Janik <timj@gtk.org>
* gtk/gtkselection.h:
* gtk/gtkselection.c: new functions gtk_selection_data_copy and
gtk_selection_data_free.
* gtk/gtkwidget.c (gtk_widget_class_init): fixed gtk_signal_new() call
for "selection_received", which was completely bogus.
* other fixups to gtk_signal_new() calls all over the place.
* gtk/gtktypebuiltins.h: types as variables (formerly macros).
* gtk/gtktypebuiltins_vars.c: type variable implementations.
* gtk/gtktypebuiltins_ids.c: array entries for builtin type
declarations.
* gtk/gtktypebuiltins_evals.c: enum value arrays.
* gtk/gtk-boxed.defs: gtk and gdk structure definitions, used to build
gtk.defs.
* gtk/gtk.defs: generated file with scheme syntax for type definitions
of gtk and gdk structures and enums.
* gtk/gtktypeutils.h:
* gtk/gtktypeutils.c: reworked type ids, so they are variables not
macros anymore (this fixes binary incompatibility with new enum
definitions).
* gtk/gtkwidget.c (gtk_widget_real_key_press_event): proccess possible
key bindings for this widget.
* gtk/gtkwindow.c (gtk_window_key_press_event): chain parent class'
handler.
* gtk/gtkobject.h:
* gtk/gtkobject.c: removed gtk_object_class_new_user_signal_no_recurse()
again. new functions gtk_object_class_user_signal_new () and
gtk_object_class_user_signal_newv (), to feature the GtkSignalRunType
flag on the signal creation.
Mon Jun 8 20:52:21 1998 Tim Janik <timj@gtk.org>
* gtk/gtkcontainer.h: new signal GtkContainer::set_focus_child.
Diffstat (limited to 'gtk/gtksignal.c')
-rw-r--r-- | gtk/gtksignal.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c index ef8f13607d..93251371c1 100644 --- a/gtk/gtksignal.c +++ b/gtk/gtksignal.c @@ -55,7 +55,7 @@ struct _GtkSignal GtkType object_type; gchar *name; guint function_offset; - GtkSignalRunType run_type; + GtkSignalRunType signal_flags; GtkSignalMarshaller marshaller; GtkType return_val; GtkType *params; @@ -92,7 +92,7 @@ struct _GtkHandlerInfo GtkArg *params; GtkType *param_types; GtkType return_val; - GtkSignalRunType run_type; + GtkSignalRunType signal_flags; guint nparams; guint signal_id; }; @@ -260,7 +260,7 @@ gtk_signal_init (void) guint gtk_signal_newv (const gchar *r_name, - GtkSignalRunType run_type, + GtkSignalRunType signal_flags, GtkType object_type, guint function_offset, GtkSignalMarshaller marshaller, @@ -298,7 +298,7 @@ gtk_signal_newv (const gchar *r_name, } if (return_val != GTK_TYPE_NONE && - (run_type & GTK_RUN_BOTH) == GTK_RUN_FIRST) + (signal_flags & GTK_RUN_BOTH) == GTK_RUN_FIRST) { g_warning ("gtk_signal_newv(): signal \"%s\" with return value `%s' excludes GTK_RUN_LAST", name, gtk_type_name (return_val)); @@ -312,7 +312,7 @@ gtk_signal_newv (const gchar *r_name, signal->object_type = object_type; signal->name = name; signal->function_offset = function_offset; - signal->run_type = run_type; + signal->signal_flags = signal_flags; signal->marshaller = marshaller; signal->return_val = return_val; signal->nparams = nparams; @@ -353,7 +353,7 @@ gtk_signal_newv (const gchar *r_name, guint gtk_signal_new (const gchar *name, - GtkSignalRunType run_type, + GtkSignalRunType signal_flags, GtkType object_type, guint function_offset, GtkSignalMarshaller marshaller, @@ -383,7 +383,7 @@ gtk_signal_new (const gchar *name, params = NULL; signal_id = gtk_signal_newv (name, - run_type, + signal_flags, object_type, function_offset, marshaller, @@ -442,7 +442,7 @@ gtk_signal_query (guint signal_id) query->signal_id = signal_id; query->signal_name = signal->name; query->is_user_signal = signal->function_offset == 0; - query->run_type = signal->run_type; + query->signal_flags = signal->signal_flags; query->return_val = signal->return_val; query->nparams = signal->nparams; query->params = signal->params; @@ -1365,7 +1365,7 @@ gtk_signal_real_emit (GtkObject *object, object); #endif /* G_ENABLE_DEBUG */ - if ((signal->run_type & GTK_RUN_NO_RECURSE) && + if ((signal->signal_flags & GTK_RUN_NO_RECURSE) && gtk_emission_check (current_emissions, object, signal_id)) { gtk_emission_add (&restart_emissions, object, signal_id); @@ -1377,7 +1377,7 @@ gtk_signal_real_emit (GtkObject *object, gtk_emission_add (¤t_emissions, object, signal_id); emission_restart: - if (GTK_RUN_TYPE (signal->run_type) != GTK_RUN_LAST && signal->function_offset != 0) + if (GTK_RUN_TYPE (signal->signal_flags) != GTK_RUN_LAST && signal->function_offset != 0) { signal_func_offset = (guchar**) ((guchar*) object->klass + signal->function_offset); @@ -1397,7 +1397,7 @@ gtk_signal_real_emit (GtkObject *object, info.param_types = signal->params; info.return_val = signal->return_val; info.nparams = signal->nparams; - info.run_type = signal->run_type; + info.signal_flags = signal->signal_flags; info.signal_id = signal_id; switch (gtk_handlers_run (handlers, &info, FALSE)) @@ -1416,7 +1416,7 @@ gtk_signal_real_emit (GtkObject *object, else info.object = NULL; - if (GTK_RUN_TYPE (signal->run_type) != GTK_RUN_FIRST && signal->function_offset != 0) + if (GTK_RUN_TYPE (signal->signal_flags) != GTK_RUN_FIRST && signal->function_offset != 0) { signal_func_offset = (guchar**) ((guchar*) object->klass + signal->function_offset); @@ -1438,7 +1438,7 @@ gtk_signal_real_emit (GtkObject *object, info.param_types = signal->params; info.return_val = signal->return_val; info.nparams = signal->nparams; - info.run_type = signal->run_type; + info.signal_flags = signal->signal_flags; info.signal_id = signal_id; } switch (gtk_handlers_run (handlers, &info, TRUE)) @@ -1457,7 +1457,7 @@ gtk_signal_real_emit (GtkObject *object, gtk_emission_remove (¤t_emissions, object, signal_id); - if (signal->run_type & GTK_RUN_NO_RECURSE) + if (signal->signal_flags & GTK_RUN_NO_RECURSE) gtk_emission_remove (&restart_emissions, object, signal_id); gtk_object_unref (object); @@ -1731,13 +1731,13 @@ gtk_handlers_run (GtkHandler *handlers, gtk_emission_remove (&stop_emissions, info->object, info->signal_id); - if (info->run_type & GTK_RUN_NO_RECURSE) + if (info->signal_flags & GTK_RUN_NO_RECURSE) gtk_emission_remove (&restart_emissions, info->object, info->signal_id); gtk_signal_handler_unref (handlers, info->object); return EMISSION_DONE; } - else if ((info->run_type & GTK_RUN_NO_RECURSE) && + else if ((info->signal_flags & GTK_RUN_NO_RECURSE) && gtk_emission_check (restart_emissions, info->object, info->signal_id)) { |