AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 05:01:09 +00:00
Code Issues Projects Releases Wiki Activity

to compare pattern specs, use g_pattern_spec_equal() instead of direct

Browse Source 
Sat Oct 13 07:09:30 2001  Tim Janik  <timj@gtk.org>

        * 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.
This commit is contained in:
Tim Janik 2001-10-13 05:52:14 +00:00 committed by Tim Janik
parent 0511377235
commit cf9f0b7741
44 changed files with 891 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Sat Oct 13 07:09:30 2001 Tim Janik <timj@gtk.org>
* 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 <matthiasc@poet.de>
* gtk/gtkwidget.c: Fix some doc comments.

9
ChangeLog.pre-2-0
View File

@ -1,3 +1,12 @@
Sat Oct 13 07:09:30 2001 Tim Janik <timj@gtk.org>
* 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 <matthiasc@poet.de>
* gtk/gtkwidget.c: Fix some doc comments.

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
Sat Oct 13 07:09:30 2001 Tim Janik <timj@gtk.org>
* 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 <matthiasc@poet.de>
* gtk/gtkwidget.c: Fix some doc comments.

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
Sat Oct 13 07:09:30 2001 Tim Janik <timj@gtk.org>
* 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 <matthiasc@poet.de>
* gtk/gtkwidget.c: Fix some doc comments.

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
Sat Oct 13 07:09:30 2001 Tim Janik <timj@gtk.org>
* 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 <matthiasc@poet.de>
* gtk/gtkwidget.c: Fix some doc comments.

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
Sat Oct 13 07:09:30 2001 Tim Janik <timj@gtk.org>
* 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 <matthiasc@poet.de>
* gtk/gtkwidget.c: Fix some doc comments.

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
Sat Oct 13 07:09:30 2001 Tim Janik <timj@gtk.org>
* 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 <matthiasc@poet.de>
* gtk/gtkwidget.c: Fix some doc comments.

90
docs/reference/gdk-pixbuf/tmpl/animation.sgml
View File

@ -20,30 +20,11 @@ Animated images.
#GdkPixbufLoader
</para>
<!-- ##### ENUM GdkPixbufFrameAction ##### -->
<para>
</para>
@GDK_PIXBUF_FRAME_RETAIN:
@GDK_PIXBUF_FRAME_DISPOSE:
@GDK_PIXBUF_FRAME_REVERT:
<!-- ##### STRUCT GdkPixbufFrame ##### -->
<para>
</para>
@pixbuf:
@x_offset:
@y_offset:
@delay_time:
@elapsed:
@action:
@need_recomposite:
@bg_transparent:
@composited:
@revert:
<!-- ##### STRUCT GdkPixbufAnimation ##### -->
<para>
@ -51,6 +32,12 @@ Animated images.
</para>
<!-- ##### STRUCT GdkPixbufAnimationIter ##### -->
<para>
</para>
<!-- ##### FUNCTION gdk_pixbuf_animation_new_from_file ##### -->
<para>
@ -96,3 +83,68 @@ Animated images.
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_animation_get_iter ##### -->
<para>
</para>
@animation:
@start_time:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_animation_is_static_image ##### -->
<para>
</para>
@animation:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_animation_get_static_image ##### -->
<para>
</para>
@animation:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_animation_iter_advance ##### -->
<para>
</para>
@iter:
@current_time:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_animation_iter_get_delay_time ##### -->
<para>
</para>
@iter:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_animation_iter_on_currently_loading_frame ##### -->
<para>
</para>
@iter:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_animation_iter_get_pixbuf ##### -->
<para>
</para>
@iter:
@Returns:

13
docs/reference/gdk-pixbuf/tmpl/creating.sgml
View File

@ -82,16 +82,19 @@ Creating a pixbuf from image data that is already in memory.
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_new_from_stream ##### -->
<!-- ##### FUNCTION gdk_pixbuf_new_from_inline ##### -->
<para>
</para>
@stream_length:
@stream:
@copy_pixels:
@error:
@data_length:
@data:
@copy_pixels:
@error:
@Returns:
<!-- # Unused Parameters # -->
@inline_pixbuf:
@length:
<!-- ##### FUNCTION gdk_pixbuf_new_subpixbuf ##### -->

15
docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml
View File

@ -365,6 +365,15 @@ XlibRGB
@obj: A GTK+ object.
<!-- ##### ENUM GdkPixbufFrameAction ##### -->
<para>
</para>
@GDK_PIXBUF_FRAME_RETAIN:
@GDK_PIXBUF_FRAME_DISPOSE:
@GDK_PIXBUF_FRAME_REVERT:
<!-- ##### USER_FUNCTION GdkPixbufLastUnref ##### -->
<para>
A function of this type can be used to override the default
@ -552,14 +561,14 @@ End:
</para>
<!-- ##### FUNCTION gdk_pixbuf_new_from_inline ##### -->
<!-- ##### FUNCTION gdk_pixbuf_new_from_stream ##### -->
<para>
</para>
@inline_pixbuf:
@stream_length:
@stream:
@copy_pixels:
@length:
@error:
@Returns:

10
docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml
View File

@ -152,3 +152,13 @@ End:
-->
<!-- ##### FUNCTION gdk_pixbuf_get_option ##### -->
<para>
</para>
@pixbuf:
@key:
@Returns:

91
docs/reference/gdk-pixbuf/tmpl/inline.sgml
View File

@ -19,44 +19,41 @@ Functions for inlined pixbuf handling.
</para>
@magic:
@length:
@pixdata_type:
@rowstride:
@width:
@height:
@pixel_data:
@magic:
@length:
@pixdata_type:
@rowstride:
@width:
@height:
@pixel_data:
<!-- ##### ENUM GdkPixdataType ##### -->
<para>
</para>
@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:
<!-- ##### ENUM GdkPixdataDumpType ##### -->
<para>
</para>
@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:
<!-- ##### MACRO GDK_PIXBUF_MAGIC_NUMBER ##### -->
<para>
@ -64,21 +61,23 @@ Functions for inlined pixbuf handling.
</para>
<!-- ##### MACRO GDK_PIXDATA_HEADER_LENGTH ##### -->
<para>
</para>
<!-- ##### FUNCTION gdk_pixdata_from_pixbuf ##### -->
<para>
</para>
@pixdata:
@pixbuf:
@use_rle:
@Returns:
@pixdata:
@pixbuf:
@use_rle:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_from_pixdata ##### -->
@ -86,10 +85,10 @@ Functions for inlined pixbuf handling.
</para>
@pixdata:
@copy_pixels:
@error:
@Returns:
@pixdata:
@copy_pixels:
@error:
@Returns:
<!-- ##### FUNCTION gdk_pixdata_serialize ##### -->
@ -97,9 +96,9 @@ Functions for inlined pixbuf handling.
</para>
@pixdata:
@stream_length_p:
@Returns:
@pixdata:
@stream_length_p:
@Returns:
<!-- ##### FUNCTION gdk_pixdata_deserialize ##### -->
@ -107,11 +106,11 @@ Functions for inlined pixbuf handling.
</para>
@pixdata:
@stream_length:
@stream:
@error:
@Returns:
@pixdata:
@stream_length:
@stream:
@error:
@Returns:
<!-- ##### FUNCTION gdk_pixdata_to_csource ##### -->
@ -119,9 +118,9 @@ Functions for inlined pixbuf handling.
</para>
@pixdata:
@name:
@dump_type:
@Returns:
@pixdata:
@name:
@dump_type:
@Returns:

9
docs/reference/gdk-pixbuf/tmpl/util.sgml
View File

@ -61,3 +61,12 @@ End:
@pixelate:
<!-- ##### FUNCTION gdk_pixbuf_fill ##### -->
<para>
</para>
@pixbuf:
@pixel:

6
docs/reference/gdk/tmpl/gdk-unused.sgml
View File

@ -159,6 +159,12 @@ the device ID for the core pointer device.
@obj:
<!-- ##### MACRO GDK_WINDOWING_NANOX ##### -->
<para>
</para>
<!-- ##### STRUCT GdkColorContext ##### -->
<para>

9
docs/reference/gdk/tmpl/general.sgml
View File

@ -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.
</para>
@Returns: the program class.
@Returns: the program class.
<!-- ##### FUNCTION gdk_set_program_class ##### -->
@ -381,13 +381,6 @@ Removes the X error trap installed with gdk_error_trap_push().
<!-- ##### MACRO GDK_WINDOWING_NANOX ##### -->
<para>
</para>
<!-- ##### MACRO GDK_WINDOWING_FB ##### -->
<para>

1
docs/reference/gdk/tmpl/keys.sgml
View File

@ -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:
<!-- ##### FUNCTION gdk_keyval_name ##### -->

7
docs/reference/gdk/tmpl/regions.sgml
View File

@ -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.
<!-- ##### USER_FUNCTION GdkSpanFunc ##### -->
<para>
@ -306,7 +305,7 @@ This defines the type of the function passed to
gdk_region_spans_intersect_foreach().
</para>
@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.
</para>
@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.

4
docs/reference/gdk/tmpl/x_interaction.sgml
View File

@ -152,6 +152,8 @@ X Window System Interaction
</para>
@cursor:
<!-- # Unused Parameters # -->
@win:
@ -160,6 +162,8 @@ X Window System Interaction
</para>
@cursor:
<!-- # Unused Parameters # -->
@win:

191
docs/reference/gtk/tmpl/gtk-unused.sgml
View File

@ -193,6 +193,26 @@ Functions to adapt C structures to native calling convention.
Signal Marshallers
<!-- ##### SECTION ./tmpl/gtkpacker.sgml:Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION ./tmpl/gtkpacker.sgml:See_Also ##### -->
<para>
</para>
<!-- ##### SECTION ./tmpl/gtkpacker.sgml:Short_Description ##### -->
<!-- ##### SECTION ./tmpl/gtkpacker.sgml:Title ##### -->
GtkPacker
<!-- ##### SECTION ./tmpl/gtkprivate.sgml:Title ##### -->
Private Information
@ -450,6 +470,29 @@ The widget whose accelerators are to be shown by the #GtkAccelLabel.
</para>
<!-- ##### ENUM GtkAnchorType ##### -->
<para>
</para>
@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:
<!-- ##### USER_FUNCTION GtkArgGetFunc ##### -->
<para>
Define a function pointer. Deprecated.
@ -843,6 +886,20 @@ after other user handlers and the default handler.
@arg2:
@arg3:
<!-- ##### STRUCT GtkPacker ##### -->
<para>
</para>
@parent:
@children:
@spacing:
@default_border_width:
@default_pad_x:
@default_pad_y:
@default_i_pad_x:
@default_i_pad_y:
<!-- ##### ARG GtkPacker:default-border-width ##### -->
<para>
@ -879,6 +936,31 @@ after other user handlers and the default handler.
</para>
<!-- ##### STRUCT GtkPackerChild ##### -->
<para>
</para>
@widget:
@anchor:
@side:
@options:
@use_default:
@border_width:
@pad_x:
@pad_y:
@i_pad_x:
@i_pad_y:
<!-- ##### ENUM GtkPackerOptions ##### -->
<para>
</para>
@GTK_PACK_EXPAND:
@GTK_FILL_X:
@GTK_FILL_Y:
<!-- ##### ARG GtkPaned:handle-size ##### -->
<para>
@ -917,6 +999,16 @@ after other user handlers and the default handler.
</para>
<!-- ##### ENUM GtkSideType ##### -->
<para>
</para>
@GTK_SIDE_TOP:
@GTK_SIDE_BOTTOM:
@GTK_SIDE_LEFT:
@GTK_SIDE_RIGHT:
<!-- ##### USER_FUNCTION GtkSignalDestroy ##### -->
<para>
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).
<!-- ##### FUNCTION gtk_packer_add ##### -->
<para>
</para>
@packer:
@child:
@side:
@anchor:
@options:
@border_width:
@pad_x:
@pad_y:
@i_pad_x:
@i_pad_y:
<!-- ##### FUNCTION gtk_packer_add_defaults ##### -->
<para>
</para>
@packer:
@child:
@side:
@anchor:
@options:
<!-- ##### MACRO gtk_packer_configure ##### -->
<para>
</para>
<!-- ##### FUNCTION gtk_packer_new ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION gtk_packer_reorder_child ##### -->
<para>
</para>
@packer:
@child:
@position:
<!-- ##### FUNCTION gtk_packer_set_child_packing ##### -->
<para>
</para>
@packer:
@child:
@side:
@anchor:
@options:
@border_width:
@pad_x:
@pad_y:
@i_pad_x:
@i_pad_y:
<!-- ##### FUNCTION gtk_packer_set_default_border_width ##### -->
<para>
</para>
@packer:
@border:
<!-- ##### FUNCTION gtk_packer_set_default_ipad ##### -->
<para>
</para>
@packer:
@i_pad_x:
@i_pad_y:
<!-- ##### FUNCTION gtk_packer_set_default_pad ##### -->
<para>
</para>
@packer:
@pad_x:
@pad_y:
<!-- ##### FUNCTION gtk_packer_set_spacing ##### -->
<para>
</para>
@packer:
@spacing:
<!-- ##### FUNCTION gtk_paned_compute_position ##### -->
<para>
Internal function used by #GtkHPaned and #GtkVPaned

26
docs/reference/gtk/tmpl/gtkaccellabel.sgml
View File

@ -94,6 +94,32 @@ Creates a new #GtkAccelLabel.
@Returns: a new #GtkAccelLabel.
<!-- ##### FUNCTION gtk_accel_label_get_accel_object ##### -->
<para>
</para>
@accel_label:
@Returns:
<!-- ##### FUNCTION gtk_accel_label_set_accel_object ##### -->
<para>
</para>
@accel_label:
@accel_object:
<!-- ##### MACRO gtk_accel_label_get_accel_widget ##### -->
<para>
</para>
@accel_label:
<!-- ##### MACRO gtk_accel_label_set_accel_widget ##### -->
<para>
Sets the widget whose accelerators are to be shown.

9
docs/reference/gtk/tmpl/gtkadjustment.sgml
View File

@ -93,6 +93,15 @@ Creates a new #GtkAdjustment.
@Returns: a new #GtkAdjustment.
<!-- ##### FUNCTION gtk_adjustment_get_value ##### -->
<para>
</para>
@adjustment:
@Returns:
<!-- ##### FUNCTION gtk_adjustment_set_value ##### -->
<para>
Sets the #GtkAdjustment value.

10
docs/reference/gtk/tmpl/gtkbbox.sgml
View File

@ -153,6 +153,16 @@ box.
@ipad_y: the vertical padding that should be used by each button in @widget.
<!-- ##### FUNCTION gtk_button_box_set_child_secondary ##### -->
<para>
</para>
@widget:
@child:
@is_secondary:
<!-- ##### ARG GtkButtonBox:layout-style ##### -->
<para>

27
docs/reference/gtk/tmpl/gtkbox.sgml
View File

@ -274,6 +274,15 @@ values, %TRUE, %TRUE, and 0, respectively.
@widget: the #GtkWidget to be added to @box.
<!-- ##### FUNCTION gtk_box_get_homogeneous ##### -->
<para>
</para>
@box:
@Returns:
<!-- ##### FUNCTION gtk_box_set_homogeneous ##### -->
<para>
Sets the <structfield>homogeneous</structfield> field of
@ -286,6 +295,15 @@ given equal space in the box.
%FALSE for variable allotments.
<!-- ##### FUNCTION gtk_box_get_spacing ##### -->
<para>
</para>
@box:
@Returns:
<!-- ##### FUNCTION gtk_box_set_spacing ##### -->
<para>
Sets the <structfield>spacing</structfield> field of #GtkBox-struct,
@ -353,15 +371,6 @@ field in #GtkBoxChild-struct.
in #GtkBoxChild-struct.
<!-- ##### FUNCTION gtk_box_get_spacing ##### -->
<para>
</para>
@box:
@Returns:
<!-- ##### ARG GtkBox:spacing ##### -->
<para>
the minimum amount of space to put between children. Refers to the

54
docs/reference/gtk/tmpl/gtkbutton.sgml
View File

@ -125,6 +125,60 @@ Returns the current relief style of the given #GtkButton.
@Returns: The current #GtkReliefStyle
<!-- ##### FUNCTION gtk_button_get_label ##### -->
<para>
</para>
@button:
@Returns:
<!-- ##### FUNCTION gtk_button_set_label ##### -->
<para>
</para>
@button:
@label:
<!-- ##### FUNCTION gtk_button_get_use_stock ##### -->
<para>
</para>
@button:
@Returns:
<!-- ##### FUNCTION gtk_button_set_use_stock ##### -->
<para>
</para>
@button:
@value:
<!-- ##### FUNCTION gtk_button_get_use_underline ##### -->
<para>
</para>
@button:
@Returns:
<!-- ##### FUNCTION gtk_button_set_use_underline ##### -->
<para>
</para>
@button:
@value:
<!-- ##### SIGNAL GtkButton::activate ##### -->
<para>

2
docs/reference/gtk/tmpl/gtkcalendar.sgml
View File

@ -156,7 +156,7 @@ Remove all visual markers.
Sets display options (whether to display the heading and the month headings).
</para>
@calendar: a #GtkCalendar.
@calendar: a #GtkCalendar.
@flags: the display options to set.

18
docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml
View File

@ -28,6 +28,15 @@ GtkCellRendererToggle
@Returns:
<!-- ##### FUNCTION gtk_cell_renderer_toggle_get_radio ##### -->
<para>
</para>
@toggle:
@Returns:
<!-- ##### FUNCTION gtk_cell_renderer_toggle_set_radio ##### -->
<para>
@ -55,15 +64,6 @@ GtkCellRendererToggle
@setting:
<!-- ##### FUNCTION gtk_cell_renderer_toggle_get_radio ##### -->
<para>
</para>
@toggle:
@Returns:
<!-- ##### SIGNAL GtkCellRendererToggle::toggled ##### -->
<para>

18
docs/reference/gtk/tmpl/gtkcheckmenuitem.sgml
View File

@ -58,6 +58,15 @@ Creates a new #GtkCheckMenuItem with a label.
@Returns: a new #GtkCheckMenuItem.
<!-- ##### FUNCTION gtk_check_menu_item_new_with_mnemonic ##### -->
<para>
</para>
@label:
@Returns:
<!-- ##### MACRO gtk_check_menu_item_set_state ##### -->
<para>
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.
<!-- ##### FUNCTION gtk_check_menu_item_get_active ##### -->
<para>
</para>
@check_menu_item:
@Returns:
<!-- ##### FUNCTION gtk_check_menu_item_set_active ##### -->
<para>
Sets the active state of the menu item's check box.

9
docs/reference/gtk/tmpl/gtkcolorsel.sgml
View File

@ -215,6 +215,15 @@ time.
@Returns:
<!-- ##### USER_FUNCTION GtkColorSelectionChangePaletteFunc ##### -->
<para>
</para>
@colors:
@n_colors:
<!-- ##### FUNCTION gtk_color_selection_set_color ##### -->
<para>
Sets the color in the #GtkColorSelection. The widgets are updated

10
docs/reference/gtk/tmpl/gtkcombo.sgml
View File

@ -217,3 +217,13 @@ instead.
</para>
<!-- ##### ARG GtkCombo:allow-empty ##### -->
<para>
</para>
<!-- ##### ARG GtkCombo:value-in-list ##### -->
<para>
</para>

151
docs/reference/gtk/tmpl/gtkcontainer.sgml
View File

@ -63,6 +63,26 @@ GtkContainer
@widget:
<!-- ##### FUNCTION gtk_container_add_with_properties ##### -->
<para>
</para>
@container:
@widget:
@first_prop_name:
@Varargs:
<!-- ##### FUNCTION gtk_container_get_resize_mode ##### -->
<para>
</para>
@container:
@Returns:
<!-- ##### FUNCTION gtk_container_set_resize_mode ##### -->
<para>
@ -112,6 +132,15 @@ GtkContainer
@container:
<!-- ##### FUNCTION gtk_container_get_children ##### -->
<para>
</para>
@container:
@Returns:
<!-- ##### FUNCTION gtk_container_set_reallocate_redraws ##### -->
<para>
@ -130,6 +159,15 @@ GtkContainer
@child:
<!-- ##### FUNCTION gtk_container_get_focus_vadjustment ##### -->
<para>
</para>
@container:
@Returns:
<!-- ##### FUNCTION gtk_container_set_focus_vadjustment ##### -->
<para>
@ -139,6 +177,15 @@ GtkContainer
@adjustment:
<!-- ##### FUNCTION gtk_container_get_focus_hadjustment ##### -->
<para>
</para>
@container:
@Returns:
<!-- ##### FUNCTION gtk_container_set_focus_hadjustment ##### -->
<para>
@ -165,6 +212,17 @@ GtkContainer
@Returns:
<!-- ##### FUNCTION gtk_container_child_get ##### -->
<para>
</para>
@container:
@child:
@first_prop_name:
@Varargs:
<!-- ##### FUNCTION gtk_container_child_set ##### -->
<para>
@ -178,6 +236,50 @@ GtkContainer
@first_arg_name:
<!-- ##### FUNCTION gtk_container_child_get_property ##### -->
<para>
</para>
@container:
@child:
@property_name:
@value:
<!-- ##### FUNCTION gtk_container_child_set_property ##### -->
<para>
</para>
@container:
@child:
@property_name:
@value:
<!-- ##### FUNCTION gtk_container_child_get_valist ##### -->
<para>
</para>
@container:
@child:
@first_property_name:
@var_args:
<!-- ##### FUNCTION gtk_container_child_set_valist ##### -->
<para>
</para>
@container:
@child:
@first_property_name:
@var_args:
<!-- ##### FUNCTION gtk_container_forall ##### -->
<para>
@ -188,6 +290,15 @@ GtkContainer
@callback_data:
<!-- ##### FUNCTION gtk_container_get_border_width ##### -->
<para>
</para>
@container:
@Returns:
<!-- ##### FUNCTION gtk_container_set_border_width ##### -->
<para>
@ -207,6 +318,16 @@ GtkContainer
@event:
<!-- ##### FUNCTION gtk_container_get_focus_chain ##### -->
<para>
</para>
@container:
@focusable_widgets:
@Returns:
<!-- ##### FUNCTION gtk_container_set_focus_chain ##### -->
<para>
@ -224,6 +345,36 @@ GtkContainer
@container:
<!-- ##### FUNCTION gtk_container_class_find_child_property ##### -->
<para>
</para>
@cclass:
@property_name:
@Returns:
<!-- ##### FUNCTION gtk_container_class_install_child_property ##### -->
<para>
</para>
@cclass:
@property_id:
@pspec:
<!-- ##### FUNCTION gtk_container_class_list_child_properties ##### -->
<para>
</para>
@cclass:
@n_properties:
@Returns:
<!-- ##### SIGNAL GtkContainer::add ##### -->
<para>

40
docs/reference/gtk/tmpl/gtkdnd.sgml
View File

@ -285,6 +285,28 @@ gtk_drag_source_set() is used.
@hot_y:
<!-- ##### FUNCTION gtk_drag_set_icon_pixbuf ##### -->
<para>
</para>
@context:
@pixbuf:
@hot_x:
@hot_y:
<!-- ##### FUNCTION gtk_drag_set_icon_stock ##### -->
<para>
</para>
@context:
@stock_id:
@hot_x:
@hot_y:
<!-- ##### FUNCTION gtk_drag_set_icon_default ##### -->
<para>
</para>
@ -342,6 +364,24 @@ widget. The widget must have a window.
@mask:
<!-- ##### FUNCTION gtk_drag_source_set_icon_pixbuf ##### -->
<para>
</para>
@widget:
@pixbuf:
<!-- ##### FUNCTION gtk_drag_source_set_icon_stock ##### -->
<para>
</para>
@widget:
@stock_id:
<!-- ##### FUNCTION gtk_drag_source_unset ##### -->
<para>
Undo the effects of gtk_drag_source_set().

4
docs/reference/gtk/tmpl/gtkeditable.sgml
View File

@ -113,8 +113,8 @@ Gets the current selection bounds, if there is a selection.
</para>
@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.

11
docs/reference/gtk/tmpl/gtkenums.sgml
View File

@ -110,6 +110,16 @@ widget.
@GTK_DIR_LEFT:
@GTK_DIR_RIGHT:
<!-- ##### ENUM GtkExpanderStyle ##### -->
<para>
</para>
@GTK_EXPANDER_COLLAPSED:
@GTK_EXPANDER_SEMI_COLLAPSED:
@GTK_EXPANDER_SEMI_EXPANDED:
@GTK_EXPANDER_EXPANDED:
<!-- ##### ENUM GtkJustification ##### -->
<para>
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:
<!-- ##### ENUM GtkPathType ##### -->
<para>

1
docs/reference/gtk/tmpl/gtkradiobutton.sgml
View File

@ -155,6 +155,7 @@ Deprecated compatibility macro. Use gtk_radio_button_get_group() instead.
</para>
<!-- ##### FUNCTION gtk_radio_button_set_group ##### -->
<para>
Sets a #GtkRadioButton's group. It should be noted that this does not change

7
docs/reference/gtk/tmpl/gtkradiomenuitem.sgml
View File

@ -86,12 +86,13 @@ Deprecated compatibility macro. Use gtk_radio_menu_item_get_group() instead.
</para>
<!-- ##### FUNCTION gtk_radio_menu_item_set_group ##### -->
<para>
Sets the group of a radio menu item, or changes it.
</para>
@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.
</para>
@radio_menu_item: a #GtkRadioMenuItem.
@radio_menu_item: a #GtkRadioMenuItem.
@Returns: the group of @radio_menu_item.

22
docs/reference/gtk/tmpl/gtkrc.sgml
View File

@ -617,6 +617,18 @@ specific portions of a RC file.
@Returns:
<!-- ##### FUNCTION gtk_rc_get_style_by_paths ##### -->
<para>
</para>
@settings:
@widget_path:
@class_path:
@type:
@Returns:
<!-- ##### FUNCTION gtk_rc_add_widget_name_style ##### -->
<para>
Add a RcStyle that will be looked up by a match against
@ -683,6 +695,16 @@ Parse resource information directly from a string.
@Returns:
<!-- ##### FUNCTION gtk_rc_reparse_all_for_settings ##### -->
<para>
</para>
@settings:
@force_load:
@Returns:
<!-- ##### FUNCTION gtk_rc_add_default_file ##### -->
<para>
</para>

6
docs/reference/gtk/tmpl/gtksizegroup.sgml
View File

@ -50,6 +50,12 @@ reached from the widget by a chain of size groups of type
</para>
<!-- ##### STRUCT GtkSizeGroup ##### -->
<para>
</para>
<!-- ##### ENUM GtkSizeGroupMode ##### -->
<para>

3
docs/reference/gtk/tmpl/gtkspinbutton.sgml
View File

@ -236,8 +236,9 @@ Gets the value in the @spin_button. This function is deprecated,
use gtk_spin_button_get_value() instead.
</para>
@spin_button: a #GtkSpinButton.
@Returns: the value of @spin_button.
<!-- # Unused Parameters # -->
@spin_button: a #GtkSpinButton.
<!-- ##### FUNCTION gtk_spin_button_get_value_as_int ##### -->

2
docs/reference/gtk/tmpl/gtkstatusbar.sgml
View File

@ -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.
</para>
@statusbar: a #GtkStatusBar.
@statusbar: a #GtkStatusBar.
@setting: %TRUE to have a resize grip.

18
docs/reference/gtk/tmpl/gtktreednd.sgml
View File

@ -28,3 +28,21 @@ GtkTreeView drag-and-drop
</para>
<!-- ##### STRUCT GtkTreeDragDestIface ##### -->
<para>
</para>
@g_iface:
@drag_data_received:
@row_drop_possible:
<!-- ##### STRUCT GtkTreeDragSourceIface ##### -->
<para>
</para>
@g_iface:
@drag_data_get:
@drag_data_delete:

21
docs/reference/gtk/tmpl/gtktreeselection.sgml
View File

@ -22,6 +22,7 @@ GtkTreeSelection
@selection:
@model:
@path:
@path_currently_selected:
@data:
@Returns:
@ -123,6 +124,16 @@ GtkTreeSelection
@path:
<!-- ##### FUNCTION gtk_tree_selection_path_is_selected ##### -->
<para>
</para>
@selection:
@path:
@Returns:
<!-- ##### FUNCTION gtk_tree_selection_select_iter ##### -->
<para>
@ -141,6 +152,16 @@ GtkTreeSelection
@iter:
<!-- ##### FUNCTION gtk_tree_selection_iter_is_selected ##### -->
<para>
</para>
@selection:
@iter:
@Returns:
<!-- ##### FUNCTION gtk_tree_selection_select_all ##### -->
<para>

8
docs/reference/gtk/tmpl/gtkwidget.sgml
View File

@ -306,6 +306,14 @@ GtkWidget
@offset_y:
@shape_mask:
<!-- ##### ENUM GtkWidgetHelpType ##### -->
<para>
</para>
@GTK_WIDGET_HELP_TOOLTIP:
@GTK_WIDGET_HELP_WHATS_THIS:
<!-- ##### FUNCTION gtk_widget_new ##### -->
<para>

19
gtk/gtkbindings.c
View File

@ -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

4
gtk/gtkenums.h
View File

@ -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