summaryrefslogtreecommitdiff
path: root/gtk/gtksignal.c
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>1998-06-07 06:48:56 +0000
committerTim Janik <timj@src.gnome.org>1998-06-07 06:48:56 +0000
commita391196ba51da34253593712e8bf4552c04f19e5 (patch)
tree50c2edfc5d066467f3c33c1f82c89dd9923c44c4 /gtk/gtksignal.c
parentf522f36dd1c484b133ba6b04027667aa9144ad04 (diff)
downloadgtk+-a391196ba51da34253593712e8bf4552c04f19e5.tar.gz
fixed an assertment.
Sat Jun 6 06:01:24 1998 Tim Janik <timj@gtk.org> * gtk/gtksignal.c (gtk_signal_emitv): fixed an assertment. * gtk/makeenums.awk: a script to generate the GtkEnumValue arrays from, this should eventually be done by gentypeinfo.el somewhen. * gtk/gtkenumvalues.c: new generated file to hold GtkEnumValue arrays. * gtk/gtktypeutils.h: new function gtk_enum_values() to retrive all the enum values of an enum type. * gtk/gtk.defs: * gtk/gtkcurve.h: * gtk/gtkobject.h: * gtk/gtkprivate.h: * gtk/gtkwidget.h: * gtk/gtkenums.h: brought enum/flags definitions in sync, added a few more enum definitions for bindings and pattern matching. * some more macro and GtkType fixups in various places. * gdk/gdktypes.h (enum): added a new value GDK_AFTER_MASK, which is used as a key-release modifier for the binding system. Fri Jun 5 06:06:06 1998 Tim Janik <timj@gtk.org> * gtk/gtkmenu.h (struct _GtkMenu): removed GList*children, since it was a stale list pointer that is already present in GtkMenuShell. * gtk/gtkmenushell.h (struct _GtkMenuShellClass): added a signal GtkMenuShell::selection_done which is emitted after the menu shell poped down again and all possible menu items have been activated. Thu Jun 4 02:20:42 1998 Tim Janik <timj@gtk.org> * gtk/gtkmenushell.c (gtk_menu_shell_button_release): flush the x-queue before activation of the menuitem, so the menu is actually taken off the screen prior to any menu item activation. * gtk/gtkctree.c (gtk_ctree_get_row_data): allow function invokation for NULL nodes. * gtk/gtkwidget.h: * gtk/gtkwidget.c: new function gtk_widget_stop_accelerator to stop the emission of the "add-accelerator" signal on a widget. this is usefull to prevent accelerator installation on certain widgets. * gtk/gtknotebook.c (gtk_notebook_menu_item_create): keep the menu labels left justified, by setting their alignment. stop accelerator installation for the menu items, since we use dynamic menus. Wed Jun 3 06:41:22 1998 Tim Janik <timj@gtk.org> * gtk/gtkmenufactory.c: adaptions to use the new accel groups. people should *really* use GtkItemFactory. this is only for preserving source compatibility where possible, use of GtkMenuFactory is deprecated as of now. * gtk/gtkobject.h (gtk_object_class_add_user_signal): new function to create user signals of type GTK_RUN_NO_RECURSE. don't know why i missed this possibility when i added gtk_object_class_add_user_signal in late january. * gtk/gtkmain.c (gtk_init): ignore subsequent function calls. Sun May 31 07:31:09 1998 Tim Janik <timj@gtk.org> * gtk/gtkaccelgroup.h: * gtk/gtkaccelgroup.c: new implementation of the accelerator concept. * gtk/gtkaccellabel.h: * gtk/gtkaccellabel.c: new widget derived from GtkLabel whitch features display of the accelerators associated with a certain widget. * gtk/gtkitemfactory.h: * gtk/gtkitemfactory.c: new widget, item factory with automatic rc parsing and accelerator handling. * gtk/gtkmenu.c (gtk_menu_reposition): new function to care for positioning a menu. (gtk_menu_map): removed the allocation code. (gtk_menu_size_allocate): care for redrawing of children and resize our widget->window correctly. (gtk_menu_key_press): feature the new accelerator groups. * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): reposition the submenu if neccessary. * gtk/gtkmenuitem.c: * gtk/gtkcheckmenuitem.c: * gtk/gtkradiomenuitem.c: use GtkAccelLabel in the *_new_with_label() function variants. * gdk/gdk.c: (gdk_keyval_from_name): (gdk_keyval_name): new functions for keyval<->key-name associations. (gdk_keyval_to_upper): (gdk_keyval_to_lower): (gdk_keyval_is_upper): (gdk_keyval_is_lower): new functions to check/translate keyvalues with regards to their cases. Wed May 27 00:48:10 1998 Tim Janik <timj@gtk.org> * gtk/gtkwidget.c (gtk_widget_class_path): new function to calculate a widget's class path. (gtk_widget_path): new function to calculate a widget's name path. * gtk/gtkrc.c: newly introduced GtkPatternSpec structures to speed up pattern matching, features reversed pattern matches.
Diffstat (limited to 'gtk/gtksignal.c')
-rw-r--r--gtk/gtksignal.c23
1 files changed, 18 insertions, 5 deletions
diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index ddb18c5f35..ef8f13607d 100644
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -18,6 +18,7 @@
*/
#include <stdarg.h>
#include <string.h>
+#include <stdio.h>
#include "gtksignal.h"
@@ -475,12 +476,14 @@ gtk_signal_emitv (GtkObject *object,
g_return_if_fail (object != NULL);
g_return_if_fail (signal_id >= 1);
- g_return_if_fail (params != NULL);
signal = LOOKUP_SIGNAL_ID (signal_id);
g_return_if_fail (signal != NULL);
g_return_if_fail (gtk_type_is_a (GTK_OBJECT_TYPE (object), signal->object_type));
+ if (signal->nparams > 0)
+ g_return_if_fail (params != NULL);
+
gtk_signal_real_emit (object, signal, params);
}
@@ -1341,6 +1344,8 @@ gtk_signal_handler_insert (GtkObject *object,
}
}
+static GtkObject *gtk_trace_signal_object = NULL;
+
static void
gtk_signal_real_emit (GtkObject *object,
GtkSignal *signal,
@@ -1351,9 +1356,14 @@ gtk_signal_real_emit (GtkObject *object,
guchar **signal_func_offset;
register guint signal_id = signal->signal_id;
- if(gtk_debug_flags & GTK_DEBUG_SIGNALS)
- g_print("Sending signal %s to object %p (%s)\n",
- signal->name, object, gtk_type_name(object->klass->type));
+#ifdef G_ENABLE_DEBUG
+ if (gtk_debug_flags & GTK_DEBUG_SIGNALS ||
+ object == gtk_trace_signal_object)
+ fprintf (stdout, "trace: signal_emit(\"%s\") for %s:%p\n",
+ signal->name,
+ gtk_type_name (GTK_OBJECT_TYPE (object)),
+ object);
+#endif /* G_ENABLE_DEBUG */
if ((signal->run_type & GTK_RUN_NO_RECURSE) &&
gtk_emission_check (current_emissions, object, signal_id))
@@ -1524,6 +1534,9 @@ gtk_signal_connect_by_type (GtkObject *object,
* sure the one we are adding is valid. We need to perform
* the lookup on the objects parents as well. If it isn't
* valid then issue a warning and return.
+ * As of now (1998-05-27) this lookup shouldn't be neccessarry
+ * anymore since gtk_signal_lookup() has been reworked to only
+ * return correct signal ids per class-branch.
*/
found_it = FALSE;
class = object->klass;
@@ -1898,7 +1911,7 @@ gtk_params_get (GtkArg *params,
case GTK_TYPE_C_CALLBACK:
case GTK_TYPE_ARGS:
default:
- g_error ("unsupported type `%s' in signal return",
+ g_error ("Gtk: unsupported type `%s' in signal return",
gtk_type_name (return_val));
break;
}