diff --git a/ChangeLog b/ChangeLog index d014d0fb9c..a24b8ee9a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,16 @@ +Thu Feb 19 01:39:30 2004 Matthias Clasen + + * gtk/gtkuimanager.h: + * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Add + default handlers for all signals; for consistency and for the + benefit of language bindings which still rely on header parsing + to find the signals. (#134269, Jeroen Zwartepoorte) + Thu Feb 19 00:45:02 2004 Matthias Clasen * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): Improve the efficiency here by prepending on the list and reverting - it after the loop. (#133435, Christian Biere) + it after the loop. (#134435, Christian Biere) Thu Feb 19 00:32:21 2004 Matthias Clasen diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d014d0fb9c..a24b8ee9a3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,8 +1,16 @@ +Thu Feb 19 01:39:30 2004 Matthias Clasen + + * gtk/gtkuimanager.h: + * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Add + default handlers for all signals; for consistency and for the + benefit of language bindings which still rely on header parsing + to find the signals. (#134269, Jeroen Zwartepoorte) + Thu Feb 19 00:45:02 2004 Matthias Clasen * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): Improve the efficiency here by prepending on the list and reverting - it after the loop. (#133435, Christian Biere) + it after the loop. (#134435, Christian Biere) Thu Feb 19 00:32:21 2004 Matthias Clasen diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d014d0fb9c..a24b8ee9a3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,8 +1,16 @@ +Thu Feb 19 01:39:30 2004 Matthias Clasen + + * gtk/gtkuimanager.h: + * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Add + default handlers for all signals; for consistency and for the + benefit of language bindings which still rely on header parsing + to find the signals. (#134269, Jeroen Zwartepoorte) + Thu Feb 19 00:45:02 2004 Matthias Clasen * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): Improve the efficiency here by prepending on the list and reverting - it after the loop. (#133435, Christian Biere) + it after the loop. (#134435, Christian Biere) Thu Feb 19 00:32:21 2004 Matthias Clasen diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d014d0fb9c..a24b8ee9a3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,8 +1,16 @@ +Thu Feb 19 01:39:30 2004 Matthias Clasen + + * gtk/gtkuimanager.h: + * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Add + default handlers for all signals; for consistency and for the + benefit of language bindings which still rely on header parsing + to find the signals. (#134269, Jeroen Zwartepoorte) + Thu Feb 19 00:45:02 2004 Matthias Clasen * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): Improve the efficiency here by prepending on the list and reverting - it after the loop. (#133435, Christian Biere) + it after the loop. (#134435, Christian Biere) Thu Feb 19 00:32:21 2004 Matthias Clasen diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d014d0fb9c..a24b8ee9a3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,8 +1,16 @@ +Thu Feb 19 01:39:30 2004 Matthias Clasen + + * gtk/gtkuimanager.h: + * gtk/gtkuimanager.c (gtk_ui_manager_class_init): Add + default handlers for all signals; for consistency and for the + benefit of language bindings which still rely on header parsing + to find the signals. (#134269, Jeroen Zwartepoorte) + Thu Feb 19 00:45:02 2004 Matthias Clasen * gtk/gtktreeselection.c (gtk_tree_selection_get_selected_rows): Improve the efficiency here by prepending on the list and reverting - it after the loop. (#133435, Christian Biere) + it after the loop. (#134435, Christian Biere) Thu Feb 19 00:32:21 2004 Matthias Clasen diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index a3d78ca20c..dbb8a8c951 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -284,7 +284,9 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass) ui_manager_signals[CONNECT_PROXY] = g_signal_new ("connect_proxy", G_OBJECT_CLASS_TYPE (klass), - 0, 0, NULL, NULL, + 0, + G_STRUCT_OFFSET (GtkUIManagerClass, connect_proxy), + NULL, NULL, _gtk_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GTK_TYPE_ACTION, GTK_TYPE_WIDGET); @@ -303,7 +305,8 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass) ui_manager_signals[DISCONNECT_PROXY] = g_signal_new ("disconnect_proxy", G_OBJECT_CLASS_TYPE (klass), - 0, 0, NULL, NULL, + G_STRUCT_OFFSET (GtkUIManagerClass, disconnect_proxy), + 0, NULL, NULL, _gtk_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, GTK_TYPE_ACTION, GTK_TYPE_WIDGET); @@ -324,7 +327,8 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass) ui_manager_signals[PRE_ACTIVATE] = g_signal_new ("pre_activate", G_OBJECT_CLASS_TYPE (klass), - 0, 0, NULL, NULL, + G_STRUCT_OFFSET (GtkUIManagerClass, pre_activate), + 0, NULL, NULL, _gtk_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GTK_TYPE_ACTION); @@ -345,7 +349,8 @@ gtk_ui_manager_class_init (GtkUIManagerClass *klass) ui_manager_signals[POST_ACTIVATE] = g_signal_new ("post_activate", G_OBJECT_CLASS_TYPE (klass), - 0, 0, NULL, NULL, + G_STRUCT_OFFSET (GtkUIManagerClass, post_activate), + 0, NULL, NULL, _gtk_marshal_VOID__OBJECT, G_TYPE_NONE, 1, GTK_TYPE_ACTION); diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h index edf043a200..027a582a30 100644 --- a/gtk/gtkuimanager.h +++ b/gtk/gtkuimanager.h @@ -63,9 +63,20 @@ struct _GtkUIManager { struct _GtkUIManagerClass { GObjectClass parent_class; + /* Signals */ void (* add_widget) (GtkUIManager *merge, GtkWidget *widget); void (* actions_changed) (GtkUIManager *merge); + void (* connect_proxy) (GtkUIManager *merge, + GtkAction *action, + GtkWidget *proxy); + void (* disconnect_proxy) (GtkUIManager *merge, + GtkAction *action, + GtkWidget *proxy); + void (* pre_activate) (GtkUIManager *merge, + GtkAction *action); + void (* post_activate) (GtkUIManager *merge, + GtkAction *action); /* Padding for future expansion */ void (*_gtk_reserved1) (void);