From cf9f0b774198a0584ae067a308796ad308379edc Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sat, 13 Oct 2001 05:52:14 +0000 Subject: [PATCH] to compare pattern specs, use g_pattern_spec_equal() instead of direct Sat Oct 13 07:09:30 2001 Tim Janik * gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern specs, use g_pattern_spec_equal() instead of direct field accesses. upon compressing two equal paths of the same type, the resulting priority has to be the maximum. * gtk/gtkenums.h (enum): take GTK_PATH_PRIO_MASK out of the GtkPathPriorityType enum and make it a macro. --- ChangeLog | 9 + ChangeLog.pre-2-0 | 9 + ChangeLog.pre-2-10 | 9 + ChangeLog.pre-2-2 | 9 + ChangeLog.pre-2-4 | 9 + ChangeLog.pre-2-6 | 9 + ChangeLog.pre-2-8 | 9 + docs/reference/gdk-pixbuf/tmpl/animation.sgml | 90 +++++++-- docs/reference/gdk-pixbuf/tmpl/creating.sgml | 13 +- .../gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml | 15 +- .../reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml | 10 + docs/reference/gdk-pixbuf/tmpl/inline.sgml | 91 +++++---- docs/reference/gdk-pixbuf/tmpl/util.sgml | 9 + docs/reference/gdk/tmpl/gdk-unused.sgml | 6 + docs/reference/gdk/tmpl/general.sgml | 9 +- docs/reference/gdk/tmpl/keys.sgml | 1 + docs/reference/gdk/tmpl/regions.sgml | 7 +- docs/reference/gdk/tmpl/x_interaction.sgml | 4 + docs/reference/gtk/tmpl/gtk-unused.sgml | 191 ++++++++++++++++++ docs/reference/gtk/tmpl/gtkaccellabel.sgml | 26 +++ docs/reference/gtk/tmpl/gtkadjustment.sgml | 9 + docs/reference/gtk/tmpl/gtkbbox.sgml | 10 + docs/reference/gtk/tmpl/gtkbox.sgml | 27 ++- docs/reference/gtk/tmpl/gtkbutton.sgml | 54 +++++ docs/reference/gtk/tmpl/gtkcalendar.sgml | 2 +- .../gtk/tmpl/gtkcellrenderertoggle.sgml | 18 +- docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml | 18 ++ docs/reference/gtk/tmpl/gtkcolorsel.sgml | 9 + docs/reference/gtk/tmpl/gtkcombo.sgml | 10 + docs/reference/gtk/tmpl/gtkcontainer.sgml | 151 ++++++++++++++ docs/reference/gtk/tmpl/gtkdnd.sgml | 40 ++++ docs/reference/gtk/tmpl/gtkeditable.sgml | 4 +- docs/reference/gtk/tmpl/gtkenums.sgml | 11 +- docs/reference/gtk/tmpl/gtkradiobutton.sgml | 1 + docs/reference/gtk/tmpl/gtkradiomenuitem.sgml | 7 +- docs/reference/gtk/tmpl/gtkrc.sgml | 22 ++ docs/reference/gtk/tmpl/gtksizegroup.sgml | 6 + docs/reference/gtk/tmpl/gtkspinbutton.sgml | 3 +- docs/reference/gtk/tmpl/gtkstatusbar.sgml | 2 +- docs/reference/gtk/tmpl/gtktreednd.sgml | 18 ++ docs/reference/gtk/tmpl/gtktreeselection.sgml | 21 ++ docs/reference/gtk/tmpl/gtkwidget.sgml | 8 + gtk/gtkbindings.c | 19 +- gtk/gtkenums.h | 4 +- 44 files changed, 891 insertions(+), 118 deletions(-) diff --git a/ChangeLog b/ChangeLog index d033db2422..fb8cbaa031 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sat Oct 13 07:09:30 2001 Tim Janik + + * gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern + specs, use g_pattern_spec_equal() instead of direct field accesses. + upon compressing two equal paths of the same type, the resulting + priority has to be the maximum. + * gtk/gtkenums.h (enum): take GTK_PATH_PRIO_MASK out of the + GtkPathPriorityType enum and make it a macro. + 2001-10-12 Matthias Clasen * gtk/gtkwidget.c: Fix some doc comments. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index d033db2422..fb8cbaa031 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Sat Oct 13 07:09:30 2001 Tim Janik + + * gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern + specs, use g_pattern_spec_equal() instead of direct field accesses. + upon compressing two equal paths of the same type, the resulting + priority has to be the maximum. + * gtk/gtkenums.h (enum): take GTK_PATH_PRIO_MASK out of the + GtkPathPriorityType enum and make it a macro. + 2001-10-12 Matthias Clasen * gtk/gtkwidget.c: Fix some doc comments. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d033db2422..fb8cbaa031 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Sat Oct 13 07:09:30 2001 Tim Janik + + * gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern + specs, use g_pattern_spec_equal() instead of direct field accesses. + upon compressing two equal paths of the same type, the resulting + priority has to be the maximum. + * gtk/gtkenums.h (enum): take GTK_PATH_PRIO_MASK out of the + GtkPathPriorityType enum and make it a macro. + 2001-10-12 Matthias Clasen * gtk/gtkwidget.c: Fix some doc comments. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d033db2422..fb8cbaa031 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Sat Oct 13 07:09:30 2001 Tim Janik + + * gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern + specs, use g_pattern_spec_equal() instead of direct field accesses. + upon compressing two equal paths of the same type, the resulting + priority has to be the maximum. + * gtk/gtkenums.h (enum): take GTK_PATH_PRIO_MASK out of the + GtkPathPriorityType enum and make it a macro. + 2001-10-12 Matthias Clasen * gtk/gtkwidget.c: Fix some doc comments. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d033db2422..fb8cbaa031 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Sat Oct 13 07:09:30 2001 Tim Janik + + * gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern + specs, use g_pattern_spec_equal() instead of direct field accesses. + upon compressing two equal paths of the same type, the resulting + priority has to be the maximum. + * gtk/gtkenums.h (enum): take GTK_PATH_PRIO_MASK out of the + GtkPathPriorityType enum and make it a macro. + 2001-10-12 Matthias Clasen * gtk/gtkwidget.c: Fix some doc comments. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d033db2422..fb8cbaa031 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Sat Oct 13 07:09:30 2001 Tim Janik + + * gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern + specs, use g_pattern_spec_equal() instead of direct field accesses. + upon compressing two equal paths of the same type, the resulting + priority has to be the maximum. + * gtk/gtkenums.h (enum): take GTK_PATH_PRIO_MASK out of the + GtkPathPriorityType enum and make it a macro. + 2001-10-12 Matthias Clasen * gtk/gtkwidget.c: Fix some doc comments. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d033db2422..fb8cbaa031 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Sat Oct 13 07:09:30 2001 Tim Janik + + * gtk/gtkbindings.c (gtk_binding_set_add_path): to compare pattern + specs, use g_pattern_spec_equal() instead of direct field accesses. + upon compressing two equal paths of the same type, the resulting + priority has to be the maximum. + * gtk/gtkenums.h (enum): take GTK_PATH_PRIO_MASK out of the + GtkPathPriorityType enum and make it a macro. + 2001-10-12 Matthias Clasen * gtk/gtkwidget.c: Fix some doc comments. diff --git a/docs/reference/gdk-pixbuf/tmpl/animation.sgml b/docs/reference/gdk-pixbuf/tmpl/animation.sgml index a6d372c557..742169e7a3 100644 --- a/docs/reference/gdk-pixbuf/tmpl/animation.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/animation.sgml @@ -20,30 +20,11 @@ Animated images. #GdkPixbufLoader - - - - - -@GDK_PIXBUF_FRAME_RETAIN: -@GDK_PIXBUF_FRAME_DISPOSE: -@GDK_PIXBUF_FRAME_REVERT: - -@pixbuf: -@x_offset: -@y_offset: -@delay_time: -@elapsed: -@action: -@need_recomposite: -@bg_transparent: -@composited: -@revert: @@ -51,6 +32,12 @@ Animated images. + + + + + + @@ -96,3 +83,68 @@ Animated images. @Returns: + + + + + +@animation: +@start_time: +@Returns: + + + + + + + +@animation: +@Returns: + + + + + + + +@animation: +@Returns: + + + + + + + +@iter: +@current_time: +@Returns: + + + + + + + +@iter: +@Returns: + + + + + + + +@iter: +@Returns: + + + + + + + +@iter: +@Returns: + + diff --git a/docs/reference/gdk-pixbuf/tmpl/creating.sgml b/docs/reference/gdk-pixbuf/tmpl/creating.sgml index d9b541ba8b..0effa2aa12 100644 --- a/docs/reference/gdk-pixbuf/tmpl/creating.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/creating.sgml @@ -82,16 +82,19 @@ Creating a pixbuf from image data that is already in memory. @Returns: - + -@stream_length: -@stream: -@copy_pixels: -@error: +@data_length: +@data: +@copy_pixels: +@error: @Returns: + +@inline_pixbuf: +@length: diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml index 099d29a515..2ac542e845 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml @@ -365,6 +365,15 @@ XlibRGB @obj: A GTK+ object. + + + + + +@GDK_PIXBUF_FRAME_RETAIN: +@GDK_PIXBUF_FRAME_DISPOSE: +@GDK_PIXBUF_FRAME_REVERT: + A function of this type can be used to override the default @@ -552,14 +561,14 @@ End: - + -@inline_pixbuf: +@stream_length: +@stream: @copy_pixels: -@length: @error: @Returns: diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml index efadae967b..e34195504f 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml @@ -152,3 +152,13 @@ End: --> + + + + + +@pixbuf: +@key: +@Returns: + + diff --git a/docs/reference/gdk-pixbuf/tmpl/inline.sgml b/docs/reference/gdk-pixbuf/tmpl/inline.sgml index 9f14578a2a..4a2f3d952a 100644 --- a/docs/reference/gdk-pixbuf/tmpl/inline.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/inline.sgml @@ -19,44 +19,41 @@ Functions for inlined pixbuf handling. -@magic: -@length: -@pixdata_type: -@rowstride: -@width: -@height: -@pixel_data: - +@magic: +@length: +@pixdata_type: +@rowstride: +@width: +@height: +@pixel_data: -@GDK_PIXDATA_COLOR_TYPE_RGB: -@GDK_PIXDATA_COLOR_TYPE_RGBA: -@GDK_PIXDATA_COLOR_TYPE_MASK: -@GDK_PIXDATA_SAMPLE_WIDTH_8: -@GDK_PIXDATA_SAMPLE_WIDTH_MASK: -@GDK_PIXDATA_ENCODING_RAW: -@GDK_PIXDATA_ENCODING_RLE: -@GDK_PIXDATA_ENCODING_MASK: - +@GDK_PIXDATA_COLOR_TYPE_RGB: +@GDK_PIXDATA_COLOR_TYPE_RGBA: +@GDK_PIXDATA_COLOR_TYPE_MASK: +@GDK_PIXDATA_SAMPLE_WIDTH_8: +@GDK_PIXDATA_SAMPLE_WIDTH_MASK: +@GDK_PIXDATA_ENCODING_RAW: +@GDK_PIXDATA_ENCODING_RLE: +@GDK_PIXDATA_ENCODING_MASK: -@GDK_PIXDATA_DUMP_PIXDATA_STREAM: -@GDK_PIXDATA_DUMP_PIXDATA_STRUCT: -@GDK_PIXDATA_DUMP_MACROS: -@GDK_PIXDATA_DUMP_GTYPES: -@GDK_PIXDATA_DUMP_CTYPES: -@GDK_PIXDATA_DUMP_STATIC: -@GDK_PIXDATA_DUMP_CONST: -@GDK_PIXDATA_DUMP_RLE_DECODER: - +@GDK_PIXDATA_DUMP_PIXDATA_STREAM: +@GDK_PIXDATA_DUMP_PIXDATA_STRUCT: +@GDK_PIXDATA_DUMP_MACROS: +@GDK_PIXDATA_DUMP_GTYPES: +@GDK_PIXDATA_DUMP_CTYPES: +@GDK_PIXDATA_DUMP_STATIC: +@GDK_PIXDATA_DUMP_CONST: +@GDK_PIXDATA_DUMP_RLE_DECODER: @@ -64,21 +61,23 @@ Functions for inlined pixbuf handling. + + -@pixdata: -@pixbuf: -@use_rle: -@Returns: +@pixdata: +@pixbuf: +@use_rle: +@Returns: @@ -86,10 +85,10 @@ Functions for inlined pixbuf handling. -@pixdata: -@copy_pixels: -@error: -@Returns: +@pixdata: +@copy_pixels: +@error: +@Returns: @@ -97,9 +96,9 @@ Functions for inlined pixbuf handling. -@pixdata: -@stream_length_p: -@Returns: +@pixdata: +@stream_length_p: +@Returns: @@ -107,11 +106,11 @@ Functions for inlined pixbuf handling. -@pixdata: -@stream_length: -@stream: -@error: -@Returns: +@pixdata: +@stream_length: +@stream: +@error: +@Returns: @@ -119,9 +118,9 @@ Functions for inlined pixbuf handling. -@pixdata: -@name: -@dump_type: -@Returns: +@pixdata: +@name: +@dump_type: +@Returns: diff --git a/docs/reference/gdk-pixbuf/tmpl/util.sgml b/docs/reference/gdk-pixbuf/tmpl/util.sgml index 35726a967b..2c0404a7b8 100644 --- a/docs/reference/gdk-pixbuf/tmpl/util.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/util.sgml @@ -61,3 +61,12 @@ End: @pixelate: + + + + + +@pixbuf: +@pixel: + + diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml index 22fcbb1e9b..7311ec15d3 100644 --- a/docs/reference/gdk/tmpl/gdk-unused.sgml +++ b/docs/reference/gdk/tmpl/gdk-unused.sgml @@ -159,6 +159,12 @@ the device ID for the core pointer device. @obj: + + + + + + diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml index 849da55ec7..92c429a57b 100644 --- a/docs/reference/gdk/tmpl/general.sgml +++ b/docs/reference/gdk/tmpl/general.sgml @@ -121,7 +121,7 @@ commandline option, the default value is the program name (determined with g_get_prgname()) with the first character converted to uppercase. -@Returns: the program class. +@Returns: the program class. @@ -381,13 +381,6 @@ Removes the X error trap installed with gdk_error_trap_push(). - - - - - - - diff --git a/docs/reference/gdk/tmpl/keys.sgml b/docs/reference/gdk/tmpl/keys.sgml index 7ce60f16ab..2460fd93fa 100644 --- a/docs/reference/gdk/tmpl/keys.sgml +++ b/docs/reference/gdk/tmpl/keys.sgml @@ -176,6 +176,7 @@ Returns the direction of the keymap. @keymap: a #GdkKeymap or %NULL to use the default keymap. Returns: %PANGO_DIRECTION_LTR or %PANGO_DIRECTION_RTL. +@Returns: diff --git a/docs/reference/gdk/tmpl/regions.sgml b/docs/reference/gdk/tmpl/regions.sgml index 0f3072fc66..3315405e7f 100644 --- a/docs/reference/gdk/tmpl/regions.sgml +++ b/docs/reference/gdk/tmpl/regions.sgml @@ -297,8 +297,7 @@ at the pixel with coordinates @x, @y and ending before @x + @width, @y. @x: x coordinate of the first pixel. @y: y coordinate of the first pixel. -@width: number of pixels in the span. - +@width: number of pixels in the span. @@ -306,7 +305,7 @@ This defines the type of the function passed to gdk_region_spans_intersect_foreach(). -@span: a #GdkSpan. +@span: a #GdkSpan. @data: the user data passed to gdk_region_spans_intersect_foreach(). @@ -316,7 +315,7 @@ Calls a function on each span in the intersection of @region and @spans. -@region: a #GdkRegion. +@region: a #GdkRegion. @spans: an array of #GdkSpans. @n_spans: the length of @spans. @sorted: %TRUE if @spans is sorted wrt. the y coordinate. diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml index 0d62769392..dd9425fcbb 100644 --- a/docs/reference/gdk/tmpl/x_interaction.sgml +++ b/docs/reference/gdk/tmpl/x_interaction.sgml @@ -152,6 +152,8 @@ X Window System Interaction +@cursor: + @win: @@ -160,6 +162,8 @@ X Window System Interaction +@cursor: + @win: diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 3686e8751a..53236811d6 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -193,6 +193,26 @@ Functions to adapt C structures to native calling convention. Signal Marshallers + + + + + + + + + + + + + + + + + +GtkPacker + + Private Information @@ -450,6 +470,29 @@ The widget whose accelerators are to be shown by the #GtkAccelLabel. + + + + + +@GTK_ANCHOR_CENTER: +@GTK_ANCHOR_NORTH: +@GTK_ANCHOR_NORTH_WEST: +@GTK_ANCHOR_NORTH_EAST: +@GTK_ANCHOR_SOUTH: +@GTK_ANCHOR_SOUTH_WEST: +@GTK_ANCHOR_SOUTH_EAST: +@GTK_ANCHOR_WEST: +@GTK_ANCHOR_EAST: +@GTK_ANCHOR_N: +@GTK_ANCHOR_NW: +@GTK_ANCHOR_NE: +@GTK_ANCHOR_S: +@GTK_ANCHOR_SW: +@GTK_ANCHOR_SE: +@GTK_ANCHOR_W: +@GTK_ANCHOR_E: + Define a function pointer. Deprecated. @@ -843,6 +886,20 @@ after other user handlers and the default handler. @arg2: @arg3: + + + + + +@parent: +@children: +@spacing: +@default_border_width: +@default_pad_x: +@default_pad_y: +@default_i_pad_x: +@default_i_pad_y: + @@ -879,6 +936,31 @@ after other user handlers and the default handler. + + + + + +@widget: +@anchor: +@side: +@options: +@use_default: +@border_width: +@pad_x: +@pad_y: +@i_pad_x: +@i_pad_y: + + + + + + +@GTK_PACK_EXPAND: +@GTK_FILL_X: +@GTK_FILL_Y: + @@ -917,6 +999,16 @@ after other user handlers and the default handler. + + + + + +@GTK_SIDE_TOP: +@GTK_SIDE_BOTTOM: +@GTK_SIDE_LEFT: +@GTK_SIDE_RIGHT: + A function which you can use to clean up when the @@ -2031,6 +2123,105 @@ Set an array of arguments. @args: the desired values, as an array of #GtkArgs (which contain the names, types, and values of the arguments). + + + + + +@packer: +@child: +@side: +@anchor: +@options: +@border_width: +@pad_x: +@pad_y: +@i_pad_x: +@i_pad_y: + + + + + + +@packer: +@child: +@side: +@anchor: +@options: + + + + + + + + + + + + +@Returns: + + + + + + +@packer: +@child: +@position: + + + + + + +@packer: +@child: +@side: +@anchor: +@options: +@border_width: +@pad_x: +@pad_y: +@i_pad_x: +@i_pad_y: + + + + + + +@packer: +@border: + + + + + + +@packer: +@i_pad_x: +@i_pad_y: + + + + + + +@packer: +@pad_x: +@pad_y: + + + + + + +@packer: +@spacing: + Internal function used by #GtkHPaned and #GtkVPaned diff --git a/docs/reference/gtk/tmpl/gtkaccellabel.sgml b/docs/reference/gtk/tmpl/gtkaccellabel.sgml index 9c61f558e6..175148821c 100644 --- a/docs/reference/gtk/tmpl/gtkaccellabel.sgml +++ b/docs/reference/gtk/tmpl/gtkaccellabel.sgml @@ -94,6 +94,32 @@ Creates a new #GtkAccelLabel. @Returns: a new #GtkAccelLabel. + + + + + +@accel_label: +@Returns: + + + + + + + +@accel_label: +@accel_object: + + + + + + + +@accel_label: + + Sets the widget whose accelerators are to be shown. diff --git a/docs/reference/gtk/tmpl/gtkadjustment.sgml b/docs/reference/gtk/tmpl/gtkadjustment.sgml index bef7149651..cb17699843 100644 --- a/docs/reference/gtk/tmpl/gtkadjustment.sgml +++ b/docs/reference/gtk/tmpl/gtkadjustment.sgml @@ -93,6 +93,15 @@ Creates a new #GtkAdjustment. @Returns: a new #GtkAdjustment. + + + + + +@adjustment: +@Returns: + + Sets the #GtkAdjustment value. diff --git a/docs/reference/gtk/tmpl/gtkbbox.sgml b/docs/reference/gtk/tmpl/gtkbbox.sgml index c14c365513..38d13b2f76 100644 --- a/docs/reference/gtk/tmpl/gtkbbox.sgml +++ b/docs/reference/gtk/tmpl/gtkbbox.sgml @@ -153,6 +153,16 @@ box. @ipad_y: the vertical padding that should be used by each button in @widget. + + + + + +@widget: +@child: +@is_secondary: + + diff --git a/docs/reference/gtk/tmpl/gtkbox.sgml b/docs/reference/gtk/tmpl/gtkbox.sgml index eef0351f9a..01dfc126ce 100644 --- a/docs/reference/gtk/tmpl/gtkbox.sgml +++ b/docs/reference/gtk/tmpl/gtkbox.sgml @@ -274,6 +274,15 @@ values, %TRUE, %TRUE, and 0, respectively. @widget: the #GtkWidget to be added to @box. + + + + + +@box: +@Returns: + + Sets the homogeneous field of @@ -286,6 +295,15 @@ given equal space in the box. %FALSE for variable allotments. + + + + + +@box: +@Returns: + + Sets the spacing field of #GtkBox-struct, @@ -353,15 +371,6 @@ field in #GtkBoxChild-struct. in #GtkBoxChild-struct. - - - - - -@box: -@Returns: - - the minimum amount of space to put between children. Refers to the diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml index b7609bf4b6..c2e2650bb8 100644 --- a/docs/reference/gtk/tmpl/gtkbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkbutton.sgml @@ -125,6 +125,60 @@ Returns the current relief style of the given #GtkButton. @Returns: The current #GtkReliefStyle + + + + + +@button: +@Returns: + + + + + + + +@button: +@label: + + + + + + + +@button: +@Returns: + + + + + + + +@button: +@value: + + + + + + + +@button: +@Returns: + + + + + + + +@button: +@value: + + diff --git a/docs/reference/gtk/tmpl/gtkcalendar.sgml b/docs/reference/gtk/tmpl/gtkcalendar.sgml index 2848833d6b..f744dd755f 100644 --- a/docs/reference/gtk/tmpl/gtkcalendar.sgml +++ b/docs/reference/gtk/tmpl/gtkcalendar.sgml @@ -156,7 +156,7 @@ Remove all visual markers. Sets display options (whether to display the heading and the month headings). -@calendar: a #GtkCalendar. +@calendar: a #GtkCalendar. @flags: the display options to set. diff --git a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml index eea61a367c..eebb132639 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml @@ -28,6 +28,15 @@ GtkCellRendererToggle @Returns: + + + + + +@toggle: +@Returns: + + @@ -55,15 +64,6 @@ GtkCellRendererToggle @setting: - - - - - -@toggle: -@Returns: - - diff --git a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml index 3c9712b654..f4839373ef 100644 --- a/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml @@ -58,6 +58,15 @@ Creates a new #GtkCheckMenuItem with a label. @Returns: a new #GtkCheckMenuItem. + + + + + +@label: +@Returns: + + This macro is provided to preserve compatibility with older code. @@ -66,6 +75,15 @@ New code should use gtk_check_menu_item_set_active() function instead. + + + + + +@check_menu_item: +@Returns: + + Sets the active state of the menu item's check box. diff --git a/docs/reference/gtk/tmpl/gtkcolorsel.sgml b/docs/reference/gtk/tmpl/gtkcolorsel.sgml index 77c737926b..4d82b08b60 100644 --- a/docs/reference/gtk/tmpl/gtkcolorsel.sgml +++ b/docs/reference/gtk/tmpl/gtkcolorsel.sgml @@ -215,6 +215,15 @@ time. @Returns: + + + + + +@colors: +@n_colors: + + Sets the color in the #GtkColorSelection. The widgets are updated diff --git a/docs/reference/gtk/tmpl/gtkcombo.sgml b/docs/reference/gtk/tmpl/gtkcombo.sgml index 0e115ea39c..b4510f4af7 100644 --- a/docs/reference/gtk/tmpl/gtkcombo.sgml +++ b/docs/reference/gtk/tmpl/gtkcombo.sgml @@ -217,3 +217,13 @@ instead. + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml index 664913b52c..9d7c4e253c 100644 --- a/docs/reference/gtk/tmpl/gtkcontainer.sgml +++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml @@ -63,6 +63,26 @@ GtkContainer @widget: + + + + + +@container: +@widget: +@first_prop_name: +@Varargs: + + + + + + + +@container: +@Returns: + + @@ -112,6 +132,15 @@ GtkContainer @container: + + + + + +@container: +@Returns: + + @@ -130,6 +159,15 @@ GtkContainer @child: + + + + + +@container: +@Returns: + + @@ -139,6 +177,15 @@ GtkContainer @adjustment: + + + + + +@container: +@Returns: + + @@ -165,6 +212,17 @@ GtkContainer @Returns: + + + + + +@container: +@child: +@first_prop_name: +@Varargs: + + @@ -178,6 +236,50 @@ GtkContainer @first_arg_name: + + + + + +@container: +@child: +@property_name: +@value: + + + + + + + +@container: +@child: +@property_name: +@value: + + + + + + + +@container: +@child: +@first_property_name: +@var_args: + + + + + + + +@container: +@child: +@first_property_name: +@var_args: + + @@ -188,6 +290,15 @@ GtkContainer @callback_data: + + + + + +@container: +@Returns: + + @@ -207,6 +318,16 @@ GtkContainer @event: + + + + + +@container: +@focusable_widgets: +@Returns: + + @@ -224,6 +345,36 @@ GtkContainer @container: + + + + + +@cclass: +@property_name: +@Returns: + + + + + + + +@cclass: +@property_id: +@pspec: + + + + + + + +@cclass: +@n_properties: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtkdnd.sgml b/docs/reference/gtk/tmpl/gtkdnd.sgml index fcf88848fc..f278e854af 100644 --- a/docs/reference/gtk/tmpl/gtkdnd.sgml +++ b/docs/reference/gtk/tmpl/gtkdnd.sgml @@ -285,6 +285,28 @@ gtk_drag_source_set() is used. @hot_y: + + + + + +@context: +@pixbuf: +@hot_x: +@hot_y: + + + + + + + +@context: +@stock_id: +@hot_x: +@hot_y: + + @@ -342,6 +364,24 @@ widget. The widget must have a window. @mask: + + + + + +@widget: +@pixbuf: + + + + + + + +@widget: +@stock_id: + + Undo the effects of gtk_drag_source_set(). diff --git a/docs/reference/gtk/tmpl/gtkeditable.sgml b/docs/reference/gtk/tmpl/gtkeditable.sgml index 139918a78c..abe0814da8 100644 --- a/docs/reference/gtk/tmpl/gtkeditable.sgml +++ b/docs/reference/gtk/tmpl/gtkeditable.sgml @@ -113,8 +113,8 @@ Gets the current selection bounds, if there is a selection. @editable: a #GtkEditable widget. -@start: location to store the starting position, or %NULL. -@end: location to store the end position, or %NULL. +@start: location to store the starting position, or %NULL. +@end: location to store the end position, or %NULL. @Returns: %TRUE if there is a selection. diff --git a/docs/reference/gtk/tmpl/gtkenums.sgml b/docs/reference/gtk/tmpl/gtkenums.sgml index 3c1b296a37..4d3f4dbf40 100644 --- a/docs/reference/gtk/tmpl/gtkenums.sgml +++ b/docs/reference/gtk/tmpl/gtkenums.sgml @@ -110,6 +110,16 @@ widget. @GTK_DIR_LEFT: @GTK_DIR_RIGHT: + + + + + +@GTK_EXPANDER_COLLAPSED: +@GTK_EXPANDER_SEMI_COLLAPSED: +@GTK_EXPANDER_SEMI_EXPANDED: +@GTK_EXPANDER_EXPANDED: + Used for justifying the text inside a #GtkLabel widget. (See also @@ -185,7 +195,6 @@ Represents the packing location #GtkBox children. (See: #GtkVBox, @GTK_PATH_PRIO_THEME: @GTK_PATH_PRIO_RC: @GTK_PATH_PRIO_HIGHEST: -@GTK_PATH_PRIO_MASK: diff --git a/docs/reference/gtk/tmpl/gtkradiobutton.sgml b/docs/reference/gtk/tmpl/gtkradiobutton.sgml index 198a8cff30..661271c5ab 100644 --- a/docs/reference/gtk/tmpl/gtkradiobutton.sgml +++ b/docs/reference/gtk/tmpl/gtkradiobutton.sgml @@ -155,6 +155,7 @@ Deprecated compatibility macro. Use gtk_radio_button_get_group() instead. + Sets a #GtkRadioButton's group. It should be noted that this does not change diff --git a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml index 35ecd6c74d..2d04d30866 100644 --- a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml +++ b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml @@ -86,12 +86,13 @@ Deprecated compatibility macro. Use gtk_radio_menu_item_get_group() instead. + Sets the group of a radio menu item, or changes it. -@radio_menu_item: a #GtkRadioMenuItem. +@radio_menu_item: a #GtkRadioMenuItem. @group: the new group. @@ -101,5 +102,7 @@ Returns the group to which the radio menu item belongs, as a #GList of #GtkRadioMenuItem. The list belongs to GTK+ and should not be freed. -@radio_menu_item: a #GtkRadioMenuItem. +@radio_menu_item: a #GtkRadioMenuItem. @Returns: the group of @radio_menu_item. + + diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml index 30ffca8235..9aa21d3cc3 100644 --- a/docs/reference/gtk/tmpl/gtkrc.sgml +++ b/docs/reference/gtk/tmpl/gtkrc.sgml @@ -617,6 +617,18 @@ specific portions of a RC file. @Returns: + + + + + +@settings: +@widget_path: +@class_path: +@type: +@Returns: + + Add a RcStyle that will be looked up by a match against @@ -683,6 +695,16 @@ Parse resource information directly from a string. @Returns: + + + + + +@settings: +@force_load: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtksizegroup.sgml b/docs/reference/gtk/tmpl/gtksizegroup.sgml index 47b262708e..c8c99710ee 100644 --- a/docs/reference/gtk/tmpl/gtksizegroup.sgml +++ b/docs/reference/gtk/tmpl/gtksizegroup.sgml @@ -50,6 +50,12 @@ reached from the widget by a chain of size groups of type + + + + + + diff --git a/docs/reference/gtk/tmpl/gtkspinbutton.sgml b/docs/reference/gtk/tmpl/gtkspinbutton.sgml index 36dedde303..3207df6fd4 100644 --- a/docs/reference/gtk/tmpl/gtkspinbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkspinbutton.sgml @@ -236,8 +236,9 @@ Gets the value in the @spin_button. This function is deprecated, use gtk_spin_button_get_value() instead. -@spin_button: a #GtkSpinButton. @Returns: the value of @spin_button. + +@spin_button: a #GtkSpinButton. diff --git a/docs/reference/gtk/tmpl/gtkstatusbar.sgml b/docs/reference/gtk/tmpl/gtkstatusbar.sgml index aa170063ec..5865c8f960 100644 --- a/docs/reference/gtk/tmpl/gtkstatusbar.sgml +++ b/docs/reference/gtk/tmpl/gtkstatusbar.sgml @@ -107,7 +107,7 @@ Forces the removal of a message from a statusbar's stack. The exact context_id a Sets whether the statusbar has a resize grip. %TRUE by default. -@statusbar: a #GtkStatusBar. +@statusbar: a #GtkStatusBar. @setting: %TRUE to have a resize grip. diff --git a/docs/reference/gtk/tmpl/gtktreednd.sgml b/docs/reference/gtk/tmpl/gtktreednd.sgml index 3d0e200070..842769a899 100644 --- a/docs/reference/gtk/tmpl/gtktreednd.sgml +++ b/docs/reference/gtk/tmpl/gtktreednd.sgml @@ -28,3 +28,21 @@ GtkTreeView drag-and-drop + + + + + +@g_iface: +@drag_data_received: +@row_drop_possible: + + + + + + +@g_iface: +@drag_data_get: +@drag_data_delete: + diff --git a/docs/reference/gtk/tmpl/gtktreeselection.sgml b/docs/reference/gtk/tmpl/gtktreeselection.sgml index b6a8f56151..58fd239242 100644 --- a/docs/reference/gtk/tmpl/gtktreeselection.sgml +++ b/docs/reference/gtk/tmpl/gtktreeselection.sgml @@ -22,6 +22,7 @@ GtkTreeSelection @selection: @model: @path: +@path_currently_selected: @data: @Returns: @@ -123,6 +124,16 @@ GtkTreeSelection @path: + + + + + +@selection: +@path: +@Returns: + + @@ -141,6 +152,16 @@ GtkTreeSelection @iter: + + + + + +@selection: +@iter: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index b360b44d7a..4781aee5fd 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -306,6 +306,14 @@ GtkWidget @offset_y: @shape_mask: + + + + + +@GTK_WIDGET_HELP_TOOLTIP: +@GTK_WIDGET_HELP_WHATS_THIS: + diff --git a/gtk/gtkbindings.c b/gtk/gtkbindings.c index 41e65a15a2..66ae70f656 100644 --- a/gtk/gtkbindings.c +++ b/gtk/gtkbindings.c @@ -733,6 +733,7 @@ gtk_binding_set_add_path (GtkBindingSet *binding_set, g_return_if_fail (binding_set != NULL); g_return_if_fail (path_pattern != NULL); + g_return_if_fail (priority <= GTK_PATH_PRIO_MASK); priority &= GTK_PATH_PRIO_MASK; @@ -755,8 +756,7 @@ gtk_binding_set_add_path (GtkBindingSet *binding_set, pspec = g_new (PatternSpec, 1); pspec->pspec = g_pattern_spec_new (path_pattern); - pspec->seq_id = seq_id++ & 0x0fffffff; - pspec->seq_id |= priority << 28; + pspec->seq_id = priority << 28; pspec->user_data = binding_set; slist = *slist_p; @@ -767,17 +767,26 @@ gtk_binding_set_add_path (GtkBindingSet *binding_set, tmp_pspec = slist->data; slist = slist->next; - if (tmp_pspec->pspec->pattern_length == pspec->pspec->pattern_length && - g_str_equal (tmp_pspec->pspec->pattern_reversed, pspec->pspec->pattern_reversed)) + if (g_pattern_spec_equal (tmp_pspec->pspec, pspec->pspec)) { + GtkPathPriorityType lprio = tmp_pspec->seq_id >> 28; + g_pattern_spec_free (pspec->pspec); g_free (pspec); pspec = NULL; + if (lprio < priority) + { + tmp_pspec->seq_id &= 0x0fffffff; + tmp_pspec->seq_id |= priority << 28; + } break; } } if (pspec) - *slist_p = g_slist_prepend (*slist_p, pspec); + { + pspec->seq_id |= seq_id++ & 0x0fffffff; + *slist_p = g_slist_prepend (*slist_p, pspec); + } } static inline gboolean diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h index b62414ccd2..aac459b4d3 100644 --- a/gtk/gtkenums.h +++ b/gtk/gtkenums.h @@ -232,9 +232,9 @@ typedef enum GTK_PATH_PRIO_APPLICATION = 8, GTK_PATH_PRIO_THEME = 10, GTK_PATH_PRIO_RC = 12, - GTK_PATH_PRIO_HIGHEST = 15, - GTK_PATH_PRIO_MASK = 0x0f + GTK_PATH_PRIO_HIGHEST = 15 } GtkPathPriorityType; +#define GTK_PATH_PRIO_MASK 0x0f /* widget path types */ typedef enum