From bb985d72470cf4af5eb8e6e750b2ea3ca94641d7 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Tue, 3 Apr 2001 04:29:58 +0000 Subject: [PATCH] use more elaborate variable names. Tue Apr 3 05:09:07 2001 Tim Janik * gtk/gtkmain.c (_gtk_boolean_handled_accumulator): use more elaborate variable names. * gtk/makeenums.pl: touch this so enum files get remade. --- ChangeLog | 7 + ChangeLog.pre-2-0 | 7 + ChangeLog.pre-2-10 | 7 + ChangeLog.pre-2-2 | 7 + ChangeLog.pre-2-4 | 7 + ChangeLog.pre-2-6 | 7 + ChangeLog.pre-2-8 | 7 + docs/reference/gdk/tmpl/events.sgml | 1 + docs/reference/gtk/gtk.hierarchy | 1 - docs/reference/gtk/tmpl/gtk-unused.sgml | 22 +-- docs/reference/gtk/tmpl/gtkpaned.sgml | 15 -- docs/reference/gtk/tmpl/gtkrc.sgml | 1 + docs/reference/gtk/tmpl/gtksignal.sgml | 165 +++++++++++----------- docs/reference/gtk/tmpl/gtktreemodel.sgml | 2 +- docs/reference/gtk/tmpl/gtktypeutils.sgml | 20 ++- docs/reference/gtk/tmpl/gtkwidget.sgml | 8 ++ gtk/gtkmain.c | 12 +- gtk/makeenums.pl | 2 +- 18 files changed, 170 insertions(+), 128 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff20a9db3c..2ad0cf3859 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Apr 3 05:09:07 2001 Tim Janik + + * gtk/gtkmain.c (_gtk_boolean_handled_accumulator): use more elaborate + variable names. + + * gtk/makeenums.pl: touch this so enum files get remade. + Mon Apr 2 19:36:57 2001 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_init): Bug fix to make trees diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ff20a9db3c..2ad0cf3859 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Tue Apr 3 05:09:07 2001 Tim Janik + + * gtk/gtkmain.c (_gtk_boolean_handled_accumulator): use more elaborate + variable names. + + * gtk/makeenums.pl: touch this so enum files get remade. + Mon Apr 2 19:36:57 2001 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_init): Bug fix to make trees diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ff20a9db3c..2ad0cf3859 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Tue Apr 3 05:09:07 2001 Tim Janik + + * gtk/gtkmain.c (_gtk_boolean_handled_accumulator): use more elaborate + variable names. + + * gtk/makeenums.pl: touch this so enum files get remade. + Mon Apr 2 19:36:57 2001 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_init): Bug fix to make trees diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ff20a9db3c..2ad0cf3859 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Tue Apr 3 05:09:07 2001 Tim Janik + + * gtk/gtkmain.c (_gtk_boolean_handled_accumulator): use more elaborate + variable names. + + * gtk/makeenums.pl: touch this so enum files get remade. + Mon Apr 2 19:36:57 2001 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_init): Bug fix to make trees diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ff20a9db3c..2ad0cf3859 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Tue Apr 3 05:09:07 2001 Tim Janik + + * gtk/gtkmain.c (_gtk_boolean_handled_accumulator): use more elaborate + variable names. + + * gtk/makeenums.pl: touch this so enum files get remade. + Mon Apr 2 19:36:57 2001 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_init): Bug fix to make trees diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ff20a9db3c..2ad0cf3859 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Tue Apr 3 05:09:07 2001 Tim Janik + + * gtk/gtkmain.c (_gtk_boolean_handled_accumulator): use more elaborate + variable names. + + * gtk/makeenums.pl: touch this so enum files get remade. + Mon Apr 2 19:36:57 2001 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_init): Bug fix to make trees diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ff20a9db3c..2ad0cf3859 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Tue Apr 3 05:09:07 2001 Tim Janik + + * gtk/gtkmain.c (_gtk_boolean_handled_accumulator): use more elaborate + variable names. + + * gtk/makeenums.pl: touch this so enum files get remade. + Mon Apr 2 19:36:57 2001 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_init): Bug fix to make trees diff --git a/docs/reference/gdk/tmpl/events.sgml b/docs/reference/gdk/tmpl/events.sgml index 9e2edc7d80..994930b094 100644 --- a/docs/reference/gdk/tmpl/events.sgml +++ b/docs/reference/gdk/tmpl/events.sgml @@ -83,6 +83,7 @@ has changed. when parts of a drawable were copied. This is not very useful. @GDK_SCROLL: @GDK_WINDOW_STATE: +@GDK_SETTING: diff --git a/docs/reference/gtk/gtk.hierarchy b/docs/reference/gtk/gtk.hierarchy index 601aa73ff2..4655ff729f 100644 --- a/docs/reference/gtk/gtk.hierarchy +++ b/docs/reference/gtk/gtk.hierarchy @@ -6,7 +6,6 @@ GObject GdkPixmap GdkColormap GtkSettings - GtkRcStyle GtkObject GtkWidget GtkMisc diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 353c586d4d..f4cce16521 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -598,6 +598,12 @@ after other user handlers and the default handler. + + + + + + @@ -756,14 +762,6 @@ produce superscript and subscript. @widget: the object which received the signal. - - - - - -@widget: the object which received the signal. -@requisition: - This is an internally used function and should never be called from an @@ -1166,6 +1164,14 @@ Internal function used by #GtkHPaned and #GtkVPaned @child1_req: @child2_req: + + +Set the the handle size to @size x @size pixels. + + +@paned: a paned widget +@size: the size in pixels + Internal function. diff --git a/docs/reference/gtk/tmpl/gtkpaned.sgml b/docs/reference/gtk/tmpl/gtkpaned.sgml index 96672e06a4..214980a40e 100644 --- a/docs/reference/gtk/tmpl/gtkpaned.sgml +++ b/docs/reference/gtk/tmpl/gtkpaned.sgml @@ -72,7 +72,6 @@ gtk_widget_set_usize (frame1, 50, -1); -@handle_size: @@ -151,15 +150,6 @@ Set the width of the gutter. (The area between the two panes). @size: the width of the widget in pixels - - -Set the the handle size to @size x @size pixels. - - -@paned: a paned widget -@size: the size in pixels - - @@ -178,8 +168,3 @@ Set the the handle size to @size x @size pixels. @Returns: - - - - - diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml index fe52fbe8a2..041bbddd55 100644 --- a/docs/reference/gtk/tmpl/gtkrc.sgml +++ b/docs/reference/gtk/tmpl/gtkrc.sgml @@ -496,6 +496,7 @@ This can later be composited together with other #GtkRcStyle structures to form a #GtkStyle. +@parent_instance: @name: @bg_pixmap_name: @font_desc: diff --git a/docs/reference/gtk/tmpl/gtksignal.sgml b/docs/reference/gtk/tmpl/gtksignal.sgml index 1bb805c8ba..1a5a4f3e27 100644 --- a/docs/reference/gtk/tmpl/gtksignal.sgml +++ b/docs/reference/gtk/tmpl/gtksignal.sgml @@ -289,7 +289,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 @@ -299,13 +299,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. @@ -313,9 +312,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. @@ -383,7 +381,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. @@ -397,11 +395,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: @@ -417,7 +415,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. @@ -456,38 +454,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, @@ -508,21 +506,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 @@ -530,16 +528,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: @@ -628,98 +626,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 @@ -727,29 +722,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. @@ -760,36 +755,36 @@ 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: diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml index 1cd3fee5a7..04ee4a0caf 100644 --- a/docs/reference/gtk/tmpl/gtktreemodel.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml @@ -50,7 +50,7 @@ gtktreemodel @g_iface: -@changed: +@range_changed: @inserted: @has_child_toggled: @deleted: 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 b6cd2b3ea0..28ac76363e 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -1736,6 +1736,14 @@ a widget changes from un-anchored to anchored or vice-versa. @widget: the object which received the signal. @allocation: + + + + + +@widget: the object which received the signal. +@requisition: + diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 1b23b7c856..a2f1e6d4bf 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -1695,10 +1695,12 @@ _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint, const GValue *handler_return, gpointer dummy) { - gboolean val; - - val = g_value_get_boolean (handler_return); - g_value_set_boolean (return_accu, val); + gboolean continue_emission; + gboolean signal_handled; - return !val; + signal_handled = g_value_get_boolean (handler_return); + g_value_set_boolean (return_accu, signal_handled); + continue_emission = !signal_handled; + + return continue_emission; } diff --git a/gtk/makeenums.pl b/gtk/makeenums.pl index 62fb6c19a1..2bdd369397 100755 --- a/gtk/makeenums.pl +++ b/gtk/makeenums.pl @@ -3,7 +3,7 @@ # Information about the current enumeration my $flags; # Is enumeration a bitmask -my $seenbitshift; # Have we seen bitshift operators? +my $seenbitshift; # Have we seen bitshift operators? my $prefix; # Prefix for this enumeration my $enumname; # Name for this enumeration my $firstenum = 1; # Is this the first enumeration in file?