From 90ed53edb0f3256a5d08e8dd0681938f4d83140d Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Fri, 30 Mar 2001 10:30:28 +0000 Subject: Made these use GTK_TYPE_GDK_EVENT whenever sending an event through the 2001-03-30 Christopher James Lahey * e-table-group.c, e-table-header-item.c, e-table-item.c, e-table.c, e-tree.c: Made these use GTK_TYPE_GDK_EVENT whenever sending an event through the signal system instead of GTK_TYPE_POINTER. * e-table.c, e-tree.c (set_header_canvas_width): Check that none of the variables we're going to need are NULL before executing this function. svn path=/trunk/; revision=9042 --- widgets/table/e-tree.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'widgets/table/e-tree.c') diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c index 03a439ed2f..c7a9398627 100644 --- a/widgets/table/e-tree.c +++ b/widgets/table/e-tree.c @@ -210,6 +210,9 @@ set_header_canvas_width (ETree *e_tree) { double oldwidth, oldheight, width; + if (!(e_tree->header_item && e_tree->header_canvas && e_tree->table_canvas)) + return; + gnome_canvas_get_scroll_region (GNOME_CANVAS (e_tree->table_canvas), NULL, NULL, &width, NULL); gnome_canvas_get_scroll_region (GNOME_CANVAS (e_tree->header_canvas), @@ -1893,7 +1896,7 @@ e_tree_class_init (ETreeClass *class) object_class->type, GTK_SIGNAL_OFFSET (ETreeClass, double_click), e_marshal_NONE__INT_POINTER_INT_POINTER, - GTK_TYPE_NONE, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_POINTER); + GTK_TYPE_NONE, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT); et_signals [RIGHT_CLICK] = gtk_signal_new ("right_click", @@ -1901,7 +1904,7 @@ e_tree_class_init (ETreeClass *class) object_class->type, GTK_SIGNAL_OFFSET (ETreeClass, right_click), e_marshal_INT__INT_POINTER_INT_POINTER, - GTK_TYPE_INT, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_POINTER); + GTK_TYPE_INT, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT); et_signals [CLICK] = gtk_signal_new ("click", @@ -1909,7 +1912,7 @@ e_tree_class_init (ETreeClass *class) object_class->type, GTK_SIGNAL_OFFSET (ETreeClass, click), e_marshal_INT__INT_POINTER_INT_POINTER, - GTK_TYPE_INT, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_POINTER); + GTK_TYPE_INT, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT); et_signals [KEY_PRESS] = gtk_signal_new ("key_press", @@ -1917,7 +1920,7 @@ e_tree_class_init (ETreeClass *class) object_class->type, GTK_SIGNAL_OFFSET (ETreeClass, key_press), e_marshal_INT__INT_POINTER_INT_POINTER, - GTK_TYPE_INT, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_POINTER); + GTK_TYPE_INT, 4, GTK_TYPE_INT, GTK_TYPE_POINTER, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT); et_signals[TREE_DRAG_BEGIN] = gtk_signal_new ("tree_drag_begin", -- cgit