From 06718ecfed1751854486e5c4fbc3d1e0c3d37e00 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Thu, 8 Mar 2001 16:36:17 +0000 Subject: [PATCH] added accumulator data argument to g_signal_newc() functions. Thu Mar 8 16:51:21 2001 Tim Janik * *.c: added accumulator data argument to g_signal_newc() functions. * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_model): * gtk/gtktreeview.c (gtk_tree_view_setup_model): * gtk/treestoretest.c (make_window): s/g_signal_connect/g_signal_connectc/. * gtk/gtktextbuffer.c: completed signal arg fixups, they also needed G_SIGNAL_TYPE_STATIC_SCOPE flag. --- ChangeLog | 13 ++ ChangeLog.pre-2-0 | 13 ++ ChangeLog.pre-2-10 | 13 ++ ChangeLog.pre-2-2 | 13 ++ ChangeLog.pre-2-4 | 13 ++ ChangeLog.pre-2-6 | 13 ++ ChangeLog.pre-2-8 | 13 ++ docs/reference/gtk/tmpl/gtk-unused.sgml | 6 - docs/reference/gtk/tmpl/gtksignal.sgml | 203 +++++++++++----------- docs/reference/gtk/tmpl/gtktypeutils.sgml | 20 +-- docs/reference/gtk/tmpl/gtkwidget.sgml | 22 +-- gdk-pixbuf/gdk-pixbuf-loader.c | 10 +- gtk/gtkoptionmenu.c | 2 +- gtk/gtksignal.c | 2 +- gtk/gtktextbuffer.c | 36 ++-- gtk/gtktextlayout.c | 12 +- gtk/gtktexttag.c | 4 +- gtk/gtktexttagtable.c | 12 +- gtk/gtktreemodel.c | 8 +- gtk/gtktreemodelsort.c | 32 ++-- gtk/gtktreeview.c | 40 +++-- gtk/gtktreeviewcolumn.c | 4 +- gtk/treestoretest.c | 24 +-- tests/treestoretest.c | 24 +-- 24 files changed, 325 insertions(+), 227 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0bd1cbdef6..16d6d05576 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Thu Mar 8 16:51:21 2001 Tim Janik + + * *.c: added accumulator data argument to g_signal_newc() + functions. + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_model): + * gtk/gtktreeview.c (gtk_tree_view_setup_model): + * gtk/treestoretest.c (make_window): + s/g_signal_connect/g_signal_connectc/. + + * gtk/gtktextbuffer.c: completed signal arg fixups, + they also needed G_SIGNAL_TYPE_STATIC_SCOPE flag. + Thu Mar 8 00:02:30 2001 Owen Taylor * gtk/gtkwidget.[ch] (gtk_widget_get_name): Make diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 0bd1cbdef6..16d6d05576 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,16 @@ +Thu Mar 8 16:51:21 2001 Tim Janik + + * *.c: added accumulator data argument to g_signal_newc() + functions. + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_model): + * gtk/gtktreeview.c (gtk_tree_view_setup_model): + * gtk/treestoretest.c (make_window): + s/g_signal_connect/g_signal_connectc/. + + * gtk/gtktextbuffer.c: completed signal arg fixups, + they also needed G_SIGNAL_TYPE_STATIC_SCOPE flag. + Thu Mar 8 00:02:30 2001 Owen Taylor * gtk/gtkwidget.[ch] (gtk_widget_get_name): Make diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0bd1cbdef6..16d6d05576 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +Thu Mar 8 16:51:21 2001 Tim Janik + + * *.c: added accumulator data argument to g_signal_newc() + functions. + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_model): + * gtk/gtktreeview.c (gtk_tree_view_setup_model): + * gtk/treestoretest.c (make_window): + s/g_signal_connect/g_signal_connectc/. + + * gtk/gtktextbuffer.c: completed signal arg fixups, + they also needed G_SIGNAL_TYPE_STATIC_SCOPE flag. + Thu Mar 8 00:02:30 2001 Owen Taylor * gtk/gtkwidget.[ch] (gtk_widget_get_name): Make diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0bd1cbdef6..16d6d05576 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,16 @@ +Thu Mar 8 16:51:21 2001 Tim Janik + + * *.c: added accumulator data argument to g_signal_newc() + functions. + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_model): + * gtk/gtktreeview.c (gtk_tree_view_setup_model): + * gtk/treestoretest.c (make_window): + s/g_signal_connect/g_signal_connectc/. + + * gtk/gtktextbuffer.c: completed signal arg fixups, + they also needed G_SIGNAL_TYPE_STATIC_SCOPE flag. + Thu Mar 8 00:02:30 2001 Owen Taylor * gtk/gtkwidget.[ch] (gtk_widget_get_name): Make diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0bd1cbdef6..16d6d05576 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,16 @@ +Thu Mar 8 16:51:21 2001 Tim Janik + + * *.c: added accumulator data argument to g_signal_newc() + functions. + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_model): + * gtk/gtktreeview.c (gtk_tree_view_setup_model): + * gtk/treestoretest.c (make_window): + s/g_signal_connect/g_signal_connectc/. + + * gtk/gtktextbuffer.c: completed signal arg fixups, + they also needed G_SIGNAL_TYPE_STATIC_SCOPE flag. + Thu Mar 8 00:02:30 2001 Owen Taylor * gtk/gtkwidget.[ch] (gtk_widget_get_name): Make diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0bd1cbdef6..16d6d05576 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,16 @@ +Thu Mar 8 16:51:21 2001 Tim Janik + + * *.c: added accumulator data argument to g_signal_newc() + functions. + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_model): + * gtk/gtktreeview.c (gtk_tree_view_setup_model): + * gtk/treestoretest.c (make_window): + s/g_signal_connect/g_signal_connectc/. + + * gtk/gtktextbuffer.c: completed signal arg fixups, + they also needed G_SIGNAL_TYPE_STATIC_SCOPE flag. + Thu Mar 8 00:02:30 2001 Owen Taylor * gtk/gtkwidget.[ch] (gtk_widget_get_name): Make diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0bd1cbdef6..16d6d05576 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,16 @@ +Thu Mar 8 16:51:21 2001 Tim Janik + + * *.c: added accumulator data argument to g_signal_newc() + functions. + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_model): + * gtk/gtktreeview.c (gtk_tree_view_setup_model): + * gtk/treestoretest.c (make_window): + s/g_signal_connect/g_signal_connectc/. + + * gtk/gtktextbuffer.c: completed signal arg fixups, + they also needed G_SIGNAL_TYPE_STATIC_SCOPE flag. + Thu Mar 8 00:02:30 2001 Owen Taylor * gtk/gtkwidget.[ch] (gtk_widget_get_name): Make diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 84e9b4c678..5d0526cc17 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -1009,12 +1009,6 @@ This function is labeled private. @object: the object whose signal handlers should be destroyed. - - - - - - Find out the recursion depth of emissions for a particular type diff --git a/docs/reference/gtk/tmpl/gtksignal.sgml b/docs/reference/gtk/tmpl/gtksignal.sgml index c3696cb03c..11705206fd 100644 --- a/docs/reference/gtk/tmpl/gtksignal.sgml +++ b/docs/reference/gtk/tmpl/gtksignal.sgml @@ -157,7 +157,7 @@ you might have to write a marshaller. @field: - + A simple function pointer to get invoked when the signal is emitted. This allows you tie a hook to the signal type, @@ -168,6 +168,13 @@ You may not attach these to signals created with the #GTK_RUN_NO_HOOKS flag. +@object: +@signal_id: +@n_params: +@params: +@data: +@Returns: + @@ -244,6 +251,13 @@ to the signal. @GTK_RUN_ACTION: @GTK_RUN_NO_HOOKS: + + + + + + + Create a new signal type. (This is usually done in the @@ -301,7 +315,7 @@ you don't want a return value. the callbacks. - + Given the name of the signal and the type of object it connects to, get the signal's identifying integer. Emitting the signal @@ -311,13 +325,12 @@ by number is somewhat faster than using the name each time. It also tries the ancestors of the given type. -@Returns: the signal's identifying number, or 0 if no signal was found. - @name: the signal's name, e.g. clicked. @object_type: the type that the signal operates on, e.g. #GTK_TYPE_BUTTON. +@Returns: the signal's identifying number, or 0 if no signal was found. - + Given the signal's identifier, find its name. @@ -325,9 +338,8 @@ Given the signal's identifier, find its name. Two different signals may have the same name, if they have differing types. -@Returns: the signal name, or NULL if the signal number was invalid. - @signal_id: the signal's identifying number. +@Returns: the signal name, or NULL if the signal number was invalid. @@ -395,7 +407,7 @@ an array of GtkArgs instead of using C's varargs mechanism. followed by one which is a pointer to the return type. - + This function aborts a signal's current emission. @@ -409,11 +421,11 @@ It will print a warning if used on a signal which isn't being emitted. -@i: -@s: - @object: the object whose signal handlers you wish to stop. @signal_id: the signal identifier, as returned by gtk_signal_lookup(). + +@i: +@s: @@ -429,7 +441,7 @@ except it will lookup the signal id for you. @name: the name of the signal you wish to stop. - + Attach a function pointer and user data to a signal for a particular object. @@ -468,38 +480,38 @@ static void attach_print_signal(GtkButton* button, gint to_print) -@o: -@s: -@f: -@d: -@Returns: the connection id. - @object: the object associated with the signal, e.g. if a button is getting pressed, this is that button. @name: name of the signal. @func: function pointer to attach to the signal. @func_data: value to pass as to your function (through the marshaller). +@Returns: the connection id. + +@o: +@s: +@f: +@d: - + Attach a function pointer and user data to a signal so that this handler will be called after the other handlers. -@o: -@s: -@f: -@d: -@Returns: the unique identifier for this attachment: the connection id. - @object: the object associated with the signal. @name: name of the signal. @func: function pointer to attach to the signal. @func_data: value to pass as to your function (through the marshaller). +@Returns: the unique identifier for this attachment: the connection id. + +@o: +@s: +@f: +@d: - + This function is for registering a callback that will call another object's callback. That is, @@ -520,21 +532,21 @@ gtk_signal_connect_object(button, "clicked", gtk_widget_show, window); -@o: -@s: -@f: -@d: -@Returns: the connection id. - @object: the object which emits the signal. @name: the name of the signal. @func: the function to callback. @slot_object: the object to pass as the first parameter to func. (Though it pretends to take an object, you can really pass any gpointer as the #slot_object .) +@Returns: the connection id. + +@o: +@s: +@f: +@d: - + Attach a signal hook to a signal, passing in an alternate object as the first parameter, and guaranteeing @@ -542,16 +554,16 @@ that the default handler and all normal handlers are called first. -@o: -@s: -@f: -@d: -@Returns: the connection id. - @object: the object associated with the signal. @name: name of the signal. @func: function pointer to attach to the signal. @slot_object: the object to pass as the first parameter to #func. +@Returns: the connection id. + +@o: +@s: +@f: +@d: @@ -640,98 +652,95 @@ should signal the removal of this signal. @name: name of the signal. - + Destroy a user-defined handler connection. - @object: the object which the handler pertains to. @handler_id: the connection id. - + Destroy all connections for a particular object, with the given function-pointer and user-data. -@o: -@f: -@d: - @object: the object which emits the signal. @func: the function pointer to search for. @data: the user data to search for. + +@o: +@f: +@d: - + Destroy all connections for a particular object, with the given user-data. -@o: -@d: - @object: the object which emits the signal. @data: the user data to search for. + +@o: +@d: - + Prevent an user-defined handler from being invoked. All other signal processing will go on as normal, but this particular handler will ignore it. - @object: the object which emits the signal to block. @handler_id: the connection id. - + Prevent a user-defined handler from being invoked, by reference to the user-defined handler's function pointer and user data. (It may result in multiple hooks being blocked, if you've called connect multiple times.) -@o: -@f: -@d: - @object: the object which emits the signal to block. @func: the function pointer of the handler to block. @data: the user data of the handler to block. + +@o: +@f: +@d: - + Prevent all user-defined handlers with a certain user data from being invoked. -@o: -@d: - @object: the object which emits the signal we want to block. @data: the user data of the handlers to block. + +@o: +@d: - + Undo a block, by connection id. Note that undoing a block doesn't necessarily make the hook callable, because if you block a hook twice, you must unblock it twice. - @object: the object which emits the signal we want to unblock. @handler_id: the emission handler identifier, as returned by gtk_signal_connect(), etc. - + Undo a block, by function pointer and data. Note that undoing a block doesn't @@ -739,29 +748,29 @@ necessarily make the hook callable, because if you block a hook twice, you must unblock it twice. -@o: -@f: -@d: - @object: the object which emits the signal we want to unblock. @func: the function pointer to search for. @data: the user data to search for. + +@o: +@f: +@d: - + Undo block(s), to all signals for a particular object with a particular user-data pointer -@o: -@d: - @object: the object which emits the signal we want to unblock. @data: the user data to search for. + +@o: +@d: - + Returns a connection id corresponding to a given signal id and object. @@ -772,64 +781,64 @@ may opt to not emit the signal if no one is attached anyway, thus saving the cost of building the arguments. -@i: -@s: -@b: -@Returns: the connection id, if a connection was found. 0 otherwise. - @object: the object to search for the desired user-defined handler. @signal_id: the number of the signal to search for. @may_be_blocked: whether it is acceptable to return a blocked handler. +@Returns: the connection id, if a connection was found. 0 otherwise. + +@i: +@s: +@b: - + Returns a connection id corresponding to a given signal id, object, function pointer and user data. -@o: -@s: -@b: -@f: -@d: -@Returns: the connection id, if a handler was found. 0 otherwise. - @object: the object to search for the desired handler. @signal_id: the number of the signal to search for. @may_be_blocked: whether it is acceptable to return a blocked handler. @func: the function pointer to search for. @data: the user data to search for. +@Returns: the connection id, if a handler was found. 0 otherwise. + +@o: +@s: +@b: +@f: +@d: - + Add an emission hook for a type of signal, for any object. -@i: -@h: -@d: -@Returns: the id (that you may pass as a parameter -to gtk_signal_remove_emission_hook()). - @signal_id: the type of signal to hook for. @hook_func: the function to invoke to handle the emission hook. @data: the user data passed in to hook_func. +@Returns: the id (that you may pass as a parameter +to gtk_signal_remove_emission_hook()). + +@i: +@h: +@d: - + Delete an emission hook. (see gtk_signal_add_emission_hook()) -@i: -@h: - @signal_id: the id of the signal type. @hook_id: the id of the emission handler, returned by add_emission_hook(). + +@i: +@h: diff --git a/docs/reference/gtk/tmpl/gtktypeutils.sgml b/docs/reference/gtk/tmpl/gtktypeutils.sgml index 16a7e543fe..6295e2dfa1 100644 --- a/docs/reference/gtk/tmpl/gtktypeutils.sgml +++ b/docs/reference/gtk/tmpl/gtktypeutils.sgml @@ -560,33 +560,30 @@ Create a new, unique type. @type_info: must not be null, and @type_info->type_name must also not be null. - + -@Returns: a pointer to the name of a type, or NULL if it has none. - @type: a GtkType +@Returns: a pointer to the name of a type, or NULL if it has none. - + Get the internal representation of a type given its name. -@Returns: a GtkType - @name: the name of a gtk type +@Returns: a GtkType - + -@Returns: the GtkType of the parent - @type: a GtkType +@Returns: the GtkType of the parent @@ -611,16 +608,15 @@ has all the proper initializers called. @Returns: gpointer to a GtkTypeObject - + Look in the type hierarchy to see if @type has @is_a_type among its ancestors. Do so with a simple lookup, not a loop. -@Returns: - @type: GtkType @is_a_type: GtkType +@Returns: diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index 6efab91964..6f1e03319d 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -1461,6 +1461,17 @@ GtkWidget @widget: the object which received the signal. + + +Emitted when there is a chance in the hierarchy to +which a widget belong. More precisely, a widget is +anchored when its toplevel +ancestor is a #GtkWindow. This signal is emitted when +a widget changes from un-anchored to anchored or vice-versa. + + +@widget: the object which received the signal. + @@ -1530,17 +1541,6 @@ GtkWidget @widget: the object which received the signal. @old_parent: - - -Emitted when there is a chance in the hierarchy to -which a widget belong. More precisely, a widget is -anchored when its toplevel -ancestor is a #GtkWindow. This signal is emitted when -a widget changes from un-anchored to anchored or vice-versa. - - -@widget: the object which received the signal. - diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c index c21f42f8c4..2a8d2658e4 100644 --- a/gdk-pixbuf/gdk-pixbuf-loader.c +++ b/gdk-pixbuf/gdk-pixbuf-loader.c @@ -119,7 +119,7 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class) G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdkPixbufLoaderClass, area_prepared), - NULL, + NULL, NULL, gdk_pixbuf_marshal_VOID__VOID, G_TYPE_NONE, 0); @@ -128,7 +128,7 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class) G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdkPixbufLoaderClass, area_updated), - NULL, + NULL, NULL, gdk_pixbuf_marshal_VOID__INT_INT_INT_INT, G_TYPE_NONE, 4, G_TYPE_INT, @@ -141,7 +141,7 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class) G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdkPixbufLoaderClass, frame_done), - NULL, + NULL, NULL, gdk_pixbuf_marshal_VOID__POINTER, G_TYPE_NONE, 1, GDK_TYPE_PIXBUF_FRAME); @@ -151,7 +151,7 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class) G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdkPixbufLoaderClass, animation_done), - NULL, + NULL, NULL, gdk_pixbuf_marshal_VOID__VOID, G_TYPE_NONE, 0); @@ -160,7 +160,7 @@ gdk_pixbuf_loader_class_init (GdkPixbufLoaderClass *class) G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GdkPixbufLoaderClass, closed), - NULL, + NULL, NULL, gdk_pixbuf_marshal_VOID__VOID, G_TYPE_NONE, 0); } diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index 4027394216..2a5115a055 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -124,7 +124,7 @@ gtk_option_menu_class_init (GtkOptionMenuClass *class) G_OBJECT_CLASS_TYPE (class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkOptionMenuClass, changed), - NULL, + NULL, NULL, gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c index c1dc0e62e6..54a6c14f35 100644 --- a/gtk/gtksignal.c +++ b/gtk/gtksignal.c @@ -46,7 +46,7 @@ gtk_signal_newv (const gchar *name, closure = g_signal_type_cclosure_new (object_type, function_offset); - return g_signal_newv (name, object_type, signal_flags, closure, NULL, marshaller, return_val, n_params, params); + return g_signal_newv (name, object_type, signal_flags, closure, NULL, NULL, marshaller, return_val, n_params, params); } guint diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 5f51dd9ed6..669ef5b21f 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -161,12 +161,12 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, insert_text), - NULL, + NULL, NULL, gtk_marshal_VOID__BOXED_STRING_INT, GTK_TYPE_NONE, 3, - GTK_TYPE_TEXT_ITER, - GTK_TYPE_STRING, + GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE, + GTK_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE, GTK_TYPE_INT); signals[INSERT_PIXBUF] = @@ -174,11 +174,11 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, insert_pixbuf), - NULL, + NULL, NULL, gtk_marshal_VOID__BOXED_OBJECT, GTK_TYPE_NONE, 2, - GTK_TYPE_TEXT_ITER, + GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE, GDK_TYPE_PIXBUF); signals[INSERT_CHILD_ANCHOR] = @@ -186,11 +186,11 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, insert_child_anchor), - NULL, + NULL, NULL, gtk_marshal_VOID__BOXED_OBJECT, GTK_TYPE_NONE, 2, - GTK_TYPE_TEXT_ITER, + GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE, GTK_TYPE_TEXT_CHILD_ANCHOR); signals[DELETE_RANGE] = @@ -198,19 +198,19 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, delete_range), - NULL, + NULL, NULL, gtk_marshal_VOID__BOXED_BOXED, GTK_TYPE_NONE, 2, - GTK_TYPE_TEXT_ITER, - GTK_TYPE_TEXT_ITER); + GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE, + GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE); signals[CHANGED] = g_signal_newc ("changed", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, changed), - NULL, + NULL, NULL, gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); @@ -220,7 +220,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, modified_changed), - NULL, + NULL, NULL, gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); @@ -230,7 +230,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, mark_set), - NULL, + NULL, NULL, gtk_marshal_VOID__BOXED_OBJECT, GTK_TYPE_NONE, 2, @@ -242,7 +242,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, mark_deleted), - NULL, + NULL, NULL, gtk_marshal_VOID__OBJECT, GTK_TYPE_NONE, 1, @@ -253,7 +253,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, apply_tag), - NULL, + NULL, NULL, gtk_marshal_VOID__OBJECT_BOXED_BOXED, GTK_TYPE_NONE, 3, @@ -266,7 +266,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, remove_tag), - NULL, + NULL, NULL, gtk_marshal_VOID__OBJECT_BOXED_BOXED, GTK_TYPE_NONE, 3, @@ -279,7 +279,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, begin_user_action), - NULL, + NULL, NULL, gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); @@ -289,7 +289,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextBufferClass, end_user_action), - NULL, + NULL, NULL, gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 70198f7dcf..dad06d319d 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -176,8 +176,8 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextLayoutClass, invalidated), - NULL, - gtk_marshal_VOID__VOID, + NULL, NULL, + gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); @@ -186,8 +186,8 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextLayoutClass, changed), - NULL, - gtk_marshal_VOID__INT_INT_INT, + NULL, NULL, + gtk_marshal_VOID__INT_INT_INT, GTK_TYPE_NONE, 3, GTK_TYPE_INT, @@ -199,8 +199,8 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextLayoutClass, allocate_child), - NULL, - gtk_marshal_VOID__OBJECT_INT_INT, + NULL, NULL, + gtk_marshal_VOID__OBJECT_INT_INT, GTK_TYPE_NONE, 3, GTK_TYPE_OBJECT, diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c index 7d5a0c2677..ecdbf1cb87 100644 --- a/gtk/gtktexttag.c +++ b/gtk/gtktexttag.c @@ -604,8 +604,8 @@ gtk_text_tag_class_init (GtkTextTagClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, GTK_SIGNAL_OFFSET (GtkTextTagClass, event), - NULL, - gtk_marshal_INT__OBJECT_BOXED_BOXED, + NULL, NULL, + gtk_marshal_INT__OBJECT_BOXED_BOXED, GTK_TYPE_INT, 3, G_TYPE_OBJECT, diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c index 8f456e10f1..710ac8dfa6 100644 --- a/gtk/gtktexttagtable.c +++ b/gtk/gtktexttagtable.c @@ -76,8 +76,8 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass) G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextTagTableClass, tag_changed), - NULL, - gtk_marshal_VOID__OBJECT_BOOLEAN, + NULL, NULL, + gtk_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, 2, G_TYPE_OBJECT, @@ -88,8 +88,8 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass) GTK_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextTagTableClass, tag_added), - NULL, - gtk_marshal_VOID__OBJECT, + NULL, NULL, + gtk_marshal_VOID__OBJECT, GTK_TYPE_NONE, 1, G_TYPE_OBJECT); @@ -99,8 +99,8 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass) GTK_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTextTagTableClass, tag_removed), - NULL, - gtk_marshal_VOID__OBJECT, + NULL, NULL, + gtk_marshal_VOID__OBJECT, GTK_TYPE_NONE, 1, G_TYPE_OBJECT); diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index 14f4625dd6..beab330d63 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -75,7 +75,7 @@ gtk_tree_model_base_init (gpointer g_class) GTK_TYPE_TREE_MODEL, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeModelIface, changed), - NULL, + NULL, NULL, gtk_marshal_VOID__BOXED_BOXED, G_TYPE_NONE, 2, GTK_TYPE_TREE_PATH, @@ -84,7 +84,7 @@ gtk_tree_model_base_init (gpointer g_class) GTK_TYPE_TREE_MODEL, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeModelIface, inserted), - NULL, + NULL, NULL, gtk_marshal_VOID__BOXED_BOXED, G_TYPE_NONE, 2, GTK_TYPE_TREE_PATH, @@ -93,7 +93,7 @@ gtk_tree_model_base_init (gpointer g_class) GTK_TYPE_TREE_MODEL, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeModelIface, has_child_toggled), - NULL, + NULL, NULL, gtk_marshal_VOID__BOXED_BOXED, G_TYPE_NONE, 2, GTK_TYPE_TREE_PATH, @@ -102,7 +102,7 @@ gtk_tree_model_base_init (gpointer g_class) GTK_TYPE_TREE_MODEL, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeModelIface, deleted), - NULL, + NULL, NULL, gtk_marshal_VOID__BOXED, G_TYPE_NONE, 1, GTK_TYPE_TREE_PATH); diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index d5a2481701..1a1e7d9244 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -252,25 +252,29 @@ gtk_tree_model_sort_set_model (GtkTreeModelSort *tree_model_sort, if (child_model) { tree_model_sort->changed_id = - g_signal_connect (child_model, - "changed", - gtk_tree_model_sort_changed, - tree_model_sort); + g_signal_connectc (child_model, + "changed", + gtk_tree_model_sort_changed, + tree_model_sort, + FALSE); tree_model_sort->inserted_id = - g_signal_connect (child_model, + g_signal_connectc (child_model, "inserted", gtk_tree_model_sort_inserted, - tree_model_sort); + tree_model_sort, + FALSE); tree_model_sort->has_child_toggled_id = - g_signal_connect (child_model, - "has_child_toggled", - gtk_tree_model_sort_has_child_toggled, - tree_model_sort); + g_signal_connectc (child_model, + "has_child_toggled", + gtk_tree_model_sort_has_child_toggled, + tree_model_sort, + FALSE); tree_model_sort->deleted_id = - g_signal_connect (child_model, - "deleted", - gtk_tree_model_sort_deleted, - tree_model_sort); + g_signal_connectc (child_model, + "deleted", + gtk_tree_model_sort_deleted, + tree_model_sort, + FALSE); tree_model_sort->flags = gtk_tree_model_get_flags (child_model); } } diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index cfe9f9c3e0..04563be654 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -3664,24 +3664,28 @@ gtk_tree_view_setup_model (GtkTreeView *tree_view) GtkTreeIter iter; tree_view->priv->tree = _gtk_rbtree_new (); - - g_signal_connect (tree_view->priv->model, - "changed", - gtk_tree_view_changed, - tree_view); - g_signal_connect (tree_view->priv->model, - "inserted", - gtk_tree_view_inserted, - tree_view); - g_signal_connect (tree_view->priv->model, - "has_child_toggled", - gtk_tree_view_has_child_toggled, - tree_view); - g_signal_connect (tree_view->priv->model, - "deleted", - gtk_tree_view_deleted, - tree_view); - + + g_signal_connectc (tree_view->priv->model, + "changed", + gtk_tree_view_changed, + tree_view, + FALSE); + g_signal_connectc (tree_view->priv->model, + "inserted", + gtk_tree_view_inserted, + tree_view, + FALSE); + g_signal_connectc (tree_view->priv->model, + "has_child_toggled", + gtk_tree_view_has_child_toggled, + tree_view, + FALSE); + g_signal_connectc (tree_view->priv->model, + "deleted", + gtk_tree_view_deleted, + tree_view, + FALSE); + if (tree_view->priv->columns == NULL) return; diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index c5badb27ea..09e5104558 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -119,8 +119,8 @@ gtk_tree_view_column_class_init (GtkTreeViewColumnClass *class) GTK_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GtkTreeViewColumnClass, clicked), - NULL, - gtk_marshal_VOID__VOID, + NULL, NULL, + gtk_marshal_VOID__VOID, GTK_TYPE_NONE, 0); g_object_class_install_property (object_class, diff --git a/gtk/treestoretest.c b/gtk/treestoretest.c index 688054ba3b..710954ba5a 100644 --- a/gtk/treestoretest.c +++ b/gtk/treestoretest.c @@ -273,10 +273,10 @@ make_window (gint view_type) /* buttons */ button = gtk_button_new_with_label ("gtk_tree_store_remove"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (selection), - "selection_changed", - selection_changed, - button); + g_signal_connectc (G_OBJECT (selection), + "selection_changed", + selection_changed, + button, FALSE); gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_remove, tree_view); gtk_widget_set_sensitive (button, FALSE); @@ -293,19 +293,19 @@ make_window (gint view_type) button = gtk_button_new_with_label ("gtk_tree_store_insert_before"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_insert_before, tree_view); - g_signal_connect (G_OBJECT (selection), - "selection_changed", - selection_changed, - button); + g_signal_connectc (G_OBJECT (selection), + "selection_changed", + selection_changed, + button, FALSE); gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_with_label ("gtk_tree_store_insert_after"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_insert_after, tree_view); - g_signal_connect (GTK_OBJECT (selection), - "selection_changed", - selection_changed, - button); + g_signal_connectc (GTK_OBJECT (selection), + "selection_changed", + selection_changed, + button, FALSE); gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_with_label ("gtk_tree_store_prepend"); diff --git a/tests/treestoretest.c b/tests/treestoretest.c index 688054ba3b..710954ba5a 100644 --- a/tests/treestoretest.c +++ b/tests/treestoretest.c @@ -273,10 +273,10 @@ make_window (gint view_type) /* buttons */ button = gtk_button_new_with_label ("gtk_tree_store_remove"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (selection), - "selection_changed", - selection_changed, - button); + g_signal_connectc (G_OBJECT (selection), + "selection_changed", + selection_changed, + button, FALSE); gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_remove, tree_view); gtk_widget_set_sensitive (button, FALSE); @@ -293,19 +293,19 @@ make_window (gint view_type) button = gtk_button_new_with_label ("gtk_tree_store_insert_before"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_insert_before, tree_view); - g_signal_connect (G_OBJECT (selection), - "selection_changed", - selection_changed, - button); + g_signal_connectc (G_OBJECT (selection), + "selection_changed", + selection_changed, + button, FALSE); gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_with_label ("gtk_tree_store_insert_after"); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); gtk_signal_connect (GTK_OBJECT (button), "clicked", iter_insert_after, tree_view); - g_signal_connect (GTK_OBJECT (selection), - "selection_changed", - selection_changed, - button); + g_signal_connectc (GTK_OBJECT (selection), + "selection_changed", + selection_changed, + button, FALSE); gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_with_label ("gtk_tree_store_prepend");