From c26e3eeebc1a9bd9e8b3a5a10f4e29383589fb4d Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 9 Jan 2001 16:41:17 +0000 Subject: [PATCH] Restore build. Mon Jan 8 15:21:15 2001 Owen Taylor * Makefile.am (SUBDIRS): Restore build. * gdk/gdk-sections.txt gdk/gdk-docs.sgml gdk-pixbuf/gdk-pixbuf-sections.txt gtk/gtk-sections.txt gtk/gtk-docs.sgml: : Update. * */tmpl/*: Changes from update. --- docs/reference/ChangeLog | 10 + docs/reference/Makefile.am | 2 +- .../gdk-pixbuf/gdk-pixbuf-sections.txt | 4 + docs/reference/gdk-pixbuf/tmpl/animation.sgml | 21 + docs/reference/gdk-pixbuf/tmpl/creating.sgml | 2 + .../gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml | 890 +++++++++--------- docs/reference/gdk/gdk-docs.sgml | 5 +- docs/reference/gdk/gdk-sections.txt | 32 +- docs/reference/gdk/tmpl/colors.sgml | 10 + docs/reference/gdk/tmpl/drawing.sgml | 18 + docs/reference/gdk/tmpl/events.sgml | 10 + docs/reference/gdk/tmpl/gdk-unused.sgml | 218 +++-- docs/reference/gdk/tmpl/keys.sgml | 130 ++- docs/reference/gtk/gtk-docs.sgml | 4 +- docs/reference/gtk/gtk-sections.txt | 148 +-- docs/reference/gtk/gtk.hierarchy | 3 - docs/reference/gtk/tmpl/gtk-unused.sgml | 675 ++++++++++++- docs/reference/gtk/tmpl/gtkaccellabel.sgml | 2 +- docs/reference/gtk/tmpl/gtkarrow.sgml | 4 +- docs/reference/gtk/tmpl/gtkaspectframe.sgml | 2 +- docs/reference/gtk/tmpl/gtkcellrenderer.sgml | 2 +- .../gtk/tmpl/gtkcellrenderertoggle.sgml | 18 + docs/reference/gtk/tmpl/gtkclist.sgml | 36 +- docs/reference/gtk/tmpl/gtkcontainer.sgml | 6 +- docs/reference/gtk/tmpl/gtkctree.sgml | 21 +- docs/reference/gtk/tmpl/gtkcurve.sgml | 10 +- docs/reference/gtk/tmpl/gtkentry.sgml | 6 +- docs/reference/gtk/tmpl/gtkenums.sgml | 4 +- docs/reference/gtk/tmpl/gtkframe.sgml | 4 +- docs/reference/gtk/tmpl/gtkhandlebox.sgml | 4 +- docs/reference/gtk/tmpl/gtklist.sgml | 2 +- docs/reference/gtk/tmpl/gtkmain.sgml | 9 + docs/reference/gtk/tmpl/gtknotebook.sgml | 144 +-- docs/reference/gtk/tmpl/gtkobject.sgml | 265 +----- docs/reference/gtk/tmpl/gtkoldeditable.sgml | 2 +- docs/reference/gtk/tmpl/gtkoptionmenu.sgml | 7 + docs/reference/gtk/tmpl/gtkpacker.sgml | 10 +- docs/reference/gtk/tmpl/gtkpaned.sgml | 2 +- docs/reference/gtk/tmpl/gtkprogress.sgml | 8 +- docs/reference/gtk/tmpl/gtkprogressbar.sgml | 10 +- docs/reference/gtk/tmpl/gtkrange.sgml | 2 +- docs/reference/gtk/tmpl/gtkruler.sgml | 2 +- docs/reference/gtk/tmpl/gtkscale.sgml | 4 +- .../reference/gtk/tmpl/gtkscrolledwindow.sgml | 6 +- docs/reference/gtk/tmpl/gtkspinbutton.sgml | 8 +- docs/reference/gtk/tmpl/gtkstyle.sgml | 164 ++-- docs/reference/gtk/tmpl/gtktable.sgml | 8 +- docs/reference/gtk/tmpl/gtktext.sgml | 4 +- docs/reference/gtk/tmpl/gtktextbuffer.sgml | 43 +- docs/reference/gtk/tmpl/gtktextiter.sgml | 105 ++- docs/reference/gtk/tmpl/gtktextmark.sgml | 9 + docs/reference/gtk/tmpl/gtktexttag.sgml | 165 ++-- docs/reference/gtk/tmpl/gtktextview.sgml | 344 +++++-- docs/reference/gtk/tmpl/gtktipsquery.sgml | 6 +- docs/reference/gtk/tmpl/gtktogglebutton.sgml | 2 +- docs/reference/gtk/tmpl/gtktoolbar.sgml | 6 +- docs/reference/gtk/tmpl/gtktreemodel.sgml | 7 +- ...delsimple.sgml => gtktreemodelsimple.sgml} | 12 +- docs/reference/gtk/tmpl/gtktreemodelsort.sgml | 30 +- docs/reference/gtk/tmpl/gtktreeselection.sgml | 39 +- docs/reference/gtk/tmpl/gtktreeview.sgml | 6 +- .../reference/gtk/tmpl/gtktreeviewcolumn.sgml | 20 +- docs/reference/gtk/tmpl/gtkviewport.sgml | 2 +- docs/reference/gtk/tmpl/gtkwidget.sgml | 81 +- docs/reference/gtk/tmpl/gtkwindow.sgml | 14 +- 65 files changed, 2383 insertions(+), 1466 deletions(-) rename docs/reference/gtk/tmpl/{gtkmodelsimple.sgml => gtktreemodelsimple.sgml} (57%) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index e2bbb8bced..5dfdf2c948 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,13 @@ +Mon Jan 8 15:21:15 2001 Owen Taylor + + * Makefile.am (SUBDIRS): Restore build. + + * gdk/gdk-sections.txt gdk/gdk-docs.sgml + gdk-pixbuf/gdk-pixbuf-sections.txt + gtk/gtk-sections.txt gtk/gtk-docs.sgml: : Update. + + * */tmpl/*: Changes from update. + Wed Oct 25 15:19:40 2000 Owen Taylor * gtk/tmpl/gtknotebook.sgml: Moved function docs into .c diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index c581de296a..26da15420d 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -1,4 +1,4 @@ ## Process this file with automake to produce Makefile.in -# SUBDIRS = gdk-pixbuf gdk gtk +SUBDIRS = gdk-pixbuf gdk gtk diff --git a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt index 10bbe8f9f0..7f8ec01e88 100644 --- a/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt +++ b/docs/reference/gdk-pixbuf/gdk-pixbuf-sections.txt @@ -88,6 +88,8 @@ gdk_pixbuf_animation_get_frames gdk_pixbuf_animation_get_width gdk_pixbuf_animation_get_num_frames gdk_pixbuf_animation_get_height +gdk_pixbuf_frame_copy +gdk_pixbuf_frame_free gdk_pixbuf_frame_get_pixbuf gdk_pixbuf_frame_get_action gdk_pixbuf_frame_get_y_offset @@ -98,8 +100,10 @@ gdk_pixbuf_frame_get_x_offset GDK_PIXBUF_ANIMATION GDK_TYPE_PIXBUF_ANIMATION GDK_IS_PIXBUF_ANIMATION +GDK_TYPE_PIXBUF_FRAME +gdk_pixbuf_frame_get_type gdk_pixbuf_animation_get_type diff --git a/docs/reference/gdk-pixbuf/tmpl/animation.sgml b/docs/reference/gdk-pixbuf/tmpl/animation.sgml index 8253cb491d..4df2090cb6 100644 --- a/docs/reference/gdk-pixbuf/tmpl/animation.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/animation.sgml @@ -98,6 +98,27 @@ animation @Returns: + + + + + +@src: +@Returns: + +@frame: + + + + + + + +@frame: + +@src: + + diff --git a/docs/reference/gdk-pixbuf/tmpl/creating.sgml b/docs/reference/gdk-pixbuf/tmpl/creating.sgml index fe52df5bb5..f3d9f9aafd 100644 --- a/docs/reference/gdk-pixbuf/tmpl/creating.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/creating.sgml @@ -85,5 +85,7 @@ creating @pixbuf: @Returns: + +@src: diff --git a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml index f403bf522c..0d6a1219d5 100644 --- a/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml +++ b/docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml @@ -1,17 +1,157 @@ - + +Drawables to Pixbufs + + + - If this argument is %TRUE, then the width of the pixbuf will be - considered to be in pixels, that is, it will not be visually - scaled even if the item's affine transformation changes. If this - is %FALSE, then the width of the pixbuf will be considered to be - in canvas units, and so will be scaled normally by affine - transformations. The default is %FALSE. + A function of this type can be used to override the default + operation when a pixbuf loses its last reference, i.e. when + gdk_pixbuf_unref() is called on a #GdkPixbuf structure that has a + reference count of 1. This function should determine whether to + finalize the pixbuf by calling gdk_pixbuf_finalize(), or whether + to just resume normal execution. The last unref handler for a + #GdkPixbuf can be set using the + gdk_pixbuf_set_last_unref_handler() function. By default, pixbufs + will be finalized automatically if no last unref handler has been + defined. + + +@pixbuf: The pixbuf that is losing its last reference. +@data: User closure data. + + + + GdkRGB - + +X Drawables to Pixbufs + + + + + + + +@pixbuf: +@pixmap_return: +@mask_return: +@alpha_threshold: + + - GdkRGB + Indicates the width the pixbuf will be scaled to. This argument + will only be used if the width_set argument + is %TRUE. If the width_in_pixels + argument is %FALSE, the width will be taken to be in canvas units, + and thus will be scaled along with the canvas item's affine + transformation. If width_in_pixels is %TRUE, the width will be + taken to be in pixels, and will visually remain a constant size + even if the item's affine transformation changes. + + + + + + + + + + + + + + +@pixbuf: +@drawable: +@gc: +@src_x: +@src_y: +@dest_x: +@dest_y: +@width: +@height: +@dither: +@x_dither: +@y_dither: + + + + + + +@dest: +@src: +@cmap: +@src_x: +@src_y: +@dest_x: +@dest_y: +@width: +@height: +@Returns: + + + + Indicates the horizontal translation offset of the pixbuf item's + image. This offset may not actually appear horizontal, since it + will be affected by the item's affine transformation. The default + is 0.0. + + + + + + Indicates the vertical translation offset of the pixbuf item's + image. Works in the same way as the x argument. The default is + 0.0. + + + + +Initializing the &gdk-pixbuf; Xlib library. + + + + + The functions in this section allow you to take the image data + from an X drawable and dump it into a #GdkPixbuf. This can be + used for screenshots and other special effects. Note that these + operations can be expensive, since the image data has to be + transferred from the X server to the client program and converted. + + + + These functions are analogous to those for the Gdk version of + &gdk-pixbuf;. + + + + + + + + +@art_pixbuf: +@Returns: + + + + XlibRGB @@ -21,12 +161,39 @@ - + + + Contains a pointer to a #GdkPixbuf structure that will be used by + the pixbuf canvas item as an image source. When a pixbuf is set + its reference count is incremented; if the pixbuf item kept a + pointer to another #GdkPixbuf structure, the reference count of + this structure will be decremented. Also, the GdkPixbuf's + reference count will automatically be decremented when the + #GnomeCanvasPixbuf item is destroyed. When a pixbuf is queried, a + reference count will not be added to the return value; you must do + this yourself if you intend to keep the pixbuf structure around. + + + - -Canvas item to display #GdkPixbuf images. + + + + + + GdkRGB + + + + + + Determines whether the x argument is used to + translate the pixbuf from its logical origin in item-relative + coordinates. + @@ -42,20 +209,272 @@ Canvas item to display #GdkPixbuf images. - + + + + + +Canvas item to display #GdkPixbuf images. + + + + + The functions in this section allow you to take the image data + from a GDK drawable and dump it into a #GdkPixbuf. This can be + used for screenshots and other special effects. Note that these + operations can be expensive, since the image data has to be + transferred from the X server to the client program and converted. + + + + + + Determines whether the width argument is taken + into account when scaling the pixbuf item. If this argument is + %FALSE, then the width value of the pixbuf will be used instead. + This argument is %FALSE by default. + + + + + + The XlibRGB set of functions is a port of the GdkRGB library to + use plain Xlib and X drawables. You can use these functions to + render RGB buffers into drawables very quickly with high-quality + dithering. + + + + +Functions for rendering RGB buffers to X drawables. + + + + + Casts a #GtkOjbect to a #GnomeCanvasPixbuf. + + +@obj: A GTK+ object. + + + + + + + + + + + + + + + + Works in the same way as the x_in_pixels + argument, but controls whether the y translation offset is + scaled or not. The default is %FALSE. + + + + + + +Rendering a pixbuf to an X drawable. + + + + + + + +@pixbuf: + + + + If this argument is %TRUE, the pixbuf's translation with respect + to its logical origin in item-relative coordinates will be in + pixels, that is, the visible offset will not change even if the + item's affine transformation changes. If it is %FALSE, the + pixbuf's translation will be taken to be in canvas units, and thus + will change along with the item's affine transformation. The + default is %FALSE. + + + + +Rendering a pixbuf to a GDK drawable. + + + @pixbuf: -@bitmap: +@last_unref_fn: +@last_unref_fn_data: + + + + Determines whether the y argument is used to + translate the pixbuf from its logical origin in item-relative + coordinates. Works in the same way as the x_set argument. The + default is %FALSE. + + + + + + In addition to the normal Gdk-specific functions, the &gdk-pixbuf; + package provides a small library that lets Xlib-only applications + use #GdkPixbuf structures and render them to X drawables. The + functions in this section are used to initialize the &gdk-pixbuf; + Xlib library. This library must be initialized near the beginning + or the program or before calling any of the other &gdk-pixbuf; + Xlib functions; it cannot be initialized automatically since + Xlib-only applications do not call gdk_rgb_init() like GNOME + applications do. + + + + + + + + +@pixbuf: +@Returns: + + + + + + + + + + + + +@pixbuf: +@drawable: @src_x: @src_y: @dest_x: @dest_y: @width: @height: +@alpha_mode: @alpha_threshold: +@dither: +@x_dither: +@y_dither: + + + + + + + + +&gdk-pixbuf; Xlib initialization + + + + + Determines whether the height argument is + taken into account when scaling the pixbuf item. Works in the + same way as the width_set argument. + The default is %FALSE. + + + + +Getting parts of an X drawable's image data into a pixbuf. + + + +XlibRGB + + + + + If this argument is %TRUE, then the width of the pixbuf will be + considered to be in pixels, that is, it will not be visually + scaled even if the item's affine transformation changes. If this + is %FALSE, then the width of the pixbuf will be considered to be + in canvas units, and so will be scaled normally by affine + transformations. The default is %FALSE. + + + + + + Indicates the height the pixbuf will be scaled to. This argument + will only be used if the height_set argument + is %TRUE. Works in the same way as the width argument. + + + + + + Works in the same way as the width_in_pixels + argument. The default is %FALSE. + + + + + + gdk_image_get(). + + + + + + + + + + + + + + + + +Rendering + + + +GnomeCanvasPixbuf + + + + + Casts a #GtkObject to a #GdkPixbufLoader. + + +@obj: A GTK+ object. @@ -82,98 +501,35 @@ Canvas item to display #GdkPixbuf images. - -&gdk-pixbuf; Xlib initialization - - - - - Works in the same way as the width_in_pixels - argument. The default is %FALSE. - - - - - - - - - - -Rendering - - - -Getting parts of an X drawable's image data into a pixbuf. - - Getting parts of a drawable's image data into a pixbuf. - + @pixbuf: -@pixmap_return: -@mask_return: -@alpha_threshold: - - - - Works in the same way as the x_in_pixels - argument, but controls whether the y translation offset is - scaled or not. The default is %FALSE. - - - - - - -Initializing the &gdk-pixbuf; Xlib library. - - - - - - - -@pixbuf: -@drawable: +@bitmap: @src_x: @src_y: @dest_x: @dest_y: @width: @height: -@alpha_mode: @alpha_threshold: -@dither: -@x_dither: -@y_dither: - - - The XlibRGB set of functions is a port of the GdkRGB library to - use plain Xlib and X drawables. You can use these functions to - render RGB buffers into drawables very quickly with high-quality - dithering. - + + + + + + + + + + @@ -345,367 +701,11 @@ Initializing the &gdk-pixbuf; Xlib library. - -Rendering a pixbuf to a GDK drawable. - - - - - Casts a #GtkObject to a #GdkPixbufLoader. - - -@obj: A GTK+ object. - - - - - - - - - - Determines whether the x argument is used to - translate the pixbuf from its logical origin in item-relative - coordinates. - - - - - - Casts a #GtkOjbect to a #GnomeCanvasPixbuf. - - -@obj: A GTK+ object. - - - - Determines whether the width argument is taken - into account when scaling the pixbuf item. If this argument is - %FALSE, then the width value of the pixbuf will be used instead. - This argument is %FALSE by default. - - - - - - The functions in this section allow you to take the image data - from an X drawable and dump it into a #GdkPixbuf. This can be - used for screenshots and other special effects. Note that these - operations can be expensive, since the image data has to be - transferred from the X server to the client program and converted. - - - - These functions are analogous to those for the Gdk version of - &gdk-pixbuf;. - - - - - - A function of this type can be used to override the default - operation when a pixbuf loses its last reference, i.e. when - gdk_pixbuf_unref() is called on a #GdkPixbuf structure that has a - reference count of 1. This function should determine whether to - finalize the pixbuf by calling gdk_pixbuf_finalize(), or whether - to just resume normal execution. The last unref handler for a - #GdkPixbuf can be set using the - gdk_pixbuf_set_last_unref_handler() function. By default, pixbufs - will be finalized automatically if no last unref handler has been - defined. - - -@pixbuf: The pixbuf that is losing its last reference. -@data: User closure data. - - - - XlibRGB - - - - - - - - - - - - - - -@art_pixbuf: -@Returns: - - - - Indicates the height the pixbuf will be scaled to. This argument - will only be used if the height_set argument - is %TRUE. Works in the same way as the width argument. - - - Xlib Rendering - - - gdk_image_get(). - - - - - - - - - - - - Contains a pointer to a #GdkPixbuf structure that will be used by - the pixbuf canvas item as an image source. When a pixbuf is set - its reference count is incremented; if the pixbuf item kept a - pointer to another #GdkPixbuf structure, the reference count of - this structure will be decremented. Also, the GdkPixbuf's - reference count will automatically be decremented when the - #GnomeCanvasPixbuf item is destroyed. When a pixbuf is queried, a - reference count will not be added to the return value; you must do - this yourself if you intend to keep the pixbuf structure around. - - - - -Functions for rendering RGB buffers to X drawables. - - - - - Indicates the horizontal translation offset of the pixbuf item's - image. This offset may not actually appear horizontal, since it - will be affected by the item's affine transformation. The default - is 0.0. - - - - - - Indicates the vertical translation offset of the pixbuf item's - image. Works in the same way as the x argument. The default is - 0.0. - - - - - - Indicates the width the pixbuf will be scaled to. This argument - will only be used if the width_set argument - is %TRUE. If the width_in_pixels - argument is %FALSE, the width will be taken to be in canvas units, - and thus will be scaled along with the canvas item's affine - transformation. If width_in_pixels is %TRUE, the width will be - taken to be in pixels, and will visually remain a constant size - even if the item's affine transformation changes. - - - - - - - - -@pixbuf: -@last_unref_fn: -@last_unref_fn_data: - - - - Determines whether the height argument is - taken into account when scaling the pixbuf item. Works in the - same way as the width_set argument. - The default is %FALSE. - - - - - - - - -@pixbuf: -@drawable: -@gc: -@src_x: -@src_y: -@dest_x: -@dest_y: -@width: -@height: -@dither: -@x_dither: -@y_dither: - - - - In addition to the normal Gdk-specific functions, the &gdk-pixbuf; - package provides a small library that lets Xlib-only applications - use #GdkPixbuf structures and render them to X drawables. The - functions in this section are used to initialize the &gdk-pixbuf; - Xlib library. This library must be initialized near the beginning - or the program or before calling any of the other &gdk-pixbuf; - Xlib functions; it cannot be initialized automatically since - Xlib-only applications do not call gdk_rgb_init() like GNOME - applications do. - - - - - - - - - - - - - - - - - - - - - - - - GdkRGB - - - - -Rendering a pixbuf to an X drawable. - - - - - - - -@pixbuf: - - - - - - -@dest: -@src: -@cmap: -@src_x: -@src_y: -@dest_x: -@dest_y: -@width: -@height: -@Returns: - gdk-pixbuf-io - - - Determines whether the y argument is used to - translate the pixbuf from its logical origin in item-relative - coordinates. Works in the same way as the x_set argument. The - default is %FALSE. - - - - -GnomeCanvasPixbuf - - - - - - - - - - - - - -@pixbuf: -@Returns: - - - - The functions in this section allow you to take the image data - from a GDK drawable and dump it into a #GdkPixbuf. This can be - used for screenshots and other special effects. Note that these - operations can be expensive, since the image data has to be - transferred from the X server to the client program and converted. - - - - - - - - - - -X Drawables to Pixbufs - - - - - - - - - -Drawables to Pixbufs - - - - - If this argument is %TRUE, the pixbuf's translation with respect - to its logical origin in item-relative coordinates will be in - pixels, that is, the visible offset will not change even if the - item's affine transformation changes. If it is %FALSE, the - pixbuf's translation will be taken to be in canvas units, and thus - will change along with the item's affine transformation. The - default is %FALSE. - - - - -XlibRGB - - diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml index 51d744473e..80764d2ede 100644 --- a/docs/reference/gdk/gdk-docs.sgml +++ b/docs/reference/gdk/gdk-docs.sgml @@ -13,12 +13,13 @@ - + + @@ -69,7 +70,7 @@ &gdk-Input-Devices; - &gdk-Key-Values; + &gdk-Keyboard-Handling; &gdk-Pango-Interaction; &gdk-Input-Methods; diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt index 119b1c1d49..68d7c80a8b 100644 --- a/docs/reference/gdk/gdk-sections.txt +++ b/docs/reference/gdk/gdk-sections.txt @@ -177,6 +177,7 @@ gdk_colormap_change gdk_colormap_alloc_colors gdk_colormap_alloc_color gdk_colormap_free_colors +gdk_colormap_query_color gdk_colormap_get_visual gdk_colors_store gdk_color_copy @@ -257,6 +258,8 @@ gdk_drawable_set_colormap gdk_drawable_get_colormap gdk_drawable_get_depth gdk_drawable_get_size +gdk_drawable_get_clip_region +gdk_drawable_get_visible_region gdk_draw_point @@ -640,23 +643,40 @@ gdk_threads_mutex
-Key Values +Keyboard Handling keys -gdk_keyval_name -gdk_keyval_from_name +GdkKeymap +GdkKeymapClass +GdkKeymapKey +GdkKeyInfo +gdk_keymap_get_default +gdk_keymap_lookup_key +gdk_keymap_translate_keyboard_state +gdk_keymap_get_entries_for_keyval +gdk_keymap_get_entries_for_keycode -gdk_keyval_is_upper -gdk_keyval_is_lower +gdk_keyval_name +gdk_keyval_from_name gdk_keyval_convert_case gdk_keyval_to_upper gdk_keyval_to_lower +gdk_keyval_is_upper +gdk_keyval_is_lower gdk_keyval_to_unicode gdk_unicode_to_keyval + +GDK_KEYMAP +GDK_IS_KEYMAP +GDK_TYPE_KEYMAP +gdk_keymap_get_type +GDK_KEYMAP_CLASS +GDK_IS_KEYMAP_CLASS +GDK_KEYMAP_GET_CLASS
@@ -709,6 +729,7 @@ gdk_event_put gdk_event_copy gdk_event_free gdk_event_get_time +gdk_event_get_state gdk_event_get_axis @@ -862,7 +883,6 @@ GDK_GC_X11_CLASS GDK_IS_GC_X11_CLASS GdkGCX11 GdkGCX11Class -GdkGCXData GdkColormapPrivateX11 GdkCursorPrivate GdkFontPrivateX diff --git a/docs/reference/gdk/tmpl/colors.sgml b/docs/reference/gdk/tmpl/colors.sgml index e307e1a4d2..3f47ec8260 100644 --- a/docs/reference/gdk/tmpl/colors.sgml +++ b/docs/reference/gdk/tmpl/colors.sgml @@ -121,6 +121,16 @@ Colormaps and Colors @ncolors: + + + + + +@colormap: +@pixel: +@result: + + diff --git a/docs/reference/gdk/tmpl/drawing.sgml b/docs/reference/gdk/tmpl/drawing.sgml index 55adf506c7..f0270aea20 100644 --- a/docs/reference/gdk/tmpl/drawing.sgml +++ b/docs/reference/gdk/tmpl/drawing.sgml @@ -111,6 +111,24 @@ Drawing Primitives @height: + + + + + +@drawable: +@Returns: + + + + + + + +@drawable: +@Returns: + + diff --git a/docs/reference/gdk/tmpl/events.sgml b/docs/reference/gdk/tmpl/events.sgml index 1b3ba85e6a..117f6f8ce4 100644 --- a/docs/reference/gdk/tmpl/events.sgml +++ b/docs/reference/gdk/tmpl/events.sgml @@ -226,6 +226,16 @@ Gets the timestamp from a #GdkEvent. no timestamp. + + + + + +@event: +@state: +@Returns: + + diff --git a/docs/reference/gdk/tmpl/gdk-unused.sgml b/docs/reference/gdk/tmpl/gdk-unused.sgml index 184224fc37..1a71c10b42 100644 --- a/docs/reference/gdk/tmpl/gdk-unused.sgml +++ b/docs/reference/gdk/tmpl/gdk-unused.sgml @@ -1,34 +1,8 @@ - + -Enables or disables a device, and determines how the -device maps onto the screen. + -@deviceid: the device to configure. -@mode: the new mode. -@Returns: %TRUE if the device supports the given mode, otherwise - %FALSE and the device's mode is unchanged. - - - -Sets the key event generated when a macro button is pressed. - - -@deviceid: the device to configure. -@index: the index of the macro button. -@keyval: the key value for the #GdkKeypressEvent to generate. - (a value of 0 means no event will be generated.) -@modifiers: the modifier field for the generated - #GdkKeyPressEvent. - - - -Returns the intersection of two regions. - - -@source1: a #GdkRegion. -@source2: a #GdkRegion. -@Returns: the intersection of @source1 and @source2. @@ -42,32 +16,33 @@ but which are not in both. @Returns: the difference between the union and the intersection of @source1 and @source2. - + -Subtracts one region from another. -The result is a region containing all the pixels which are in @source1, but -which are not in @source2. +Retrieves the motion history for a given device/window pair. -@source1: a #GdkRegion. -@source2: a #GdkRegion to subtract from @source1. -@Returns: @source1 - @source2. +@window: a #GdkWindow. +@deviceid: the device for which to retrieve motion history. +@start: the start time. +@stop: the stop time. +@nevents_return: location to store the number of events returned. +@Returns: a newly allocated array containing all the events + from @start to @stop. This array should be freed + with g_free() when you are finished using it. - + -Lists all available input devices, along with their -configuration information. + -@Returns: A #GList of #GdkDeviceInfo structures. This list - is internal data of GTK+ and should not be modified - or freed. - + + + + - - + @@ -77,23 +52,6 @@ configuration information. - - -This macro contains an integer value representing -the device ID for the core pointer device. - - - - - -Sets the mapping of the axes (valuators) of a device -onto the predefined valuator types that GTK+ understands. - - -@deviceid: the device to configure. -@axes: an array of GdkAxisUse. This length of this array - must match the number of axes for the device. - The #GdkDeviceInfo structure contains information about a @@ -118,11 +76,47 @@ device. It has the following fields: which describe what key press events are generated for each macro button. - -Points, Rectangles and Regions + +Pango Interaction - + + +Returns the union of two regions. +This is all pixels in either of @source1 or @source2. + + +@source1: a #GdkRegion. +@source2: a #GdkRegion. +@Returns: the union of @source1 and @source2. + + + + + + + +Sets the key event generated when a macro button is pressed. + + +@deviceid: the device to configure. +@index: the index of the macro button. +@keyval: the key value for the #GdkKeypressEvent to generate. + (a value of 0 means no event will be generated.) +@modifiers: the modifier field for the generated + #GdkKeyPressEvent. + + + +Lists all available input devices, along with their +configuration information. + + +@Returns: A #GList of #GdkDeviceInfo structures. This list + is internal data of GTK+ and should not be modified + or freed. + + @@ -136,45 +130,16 @@ Points, Rectangles and Regions @GDK_PIXBUF_ALPHA_BILEVEL: @GDK_PIXBUF_ALPHA_FULL: - + -Retrieves the motion history for a given device/window pair. - - -@window: a #GdkWindow. -@deviceid: the device for which to retrieve motion history. -@start: the start time. -@stop: the stop time. -@nevents_return: location to store the number of events returned. -@Returns: a newly allocated array containing all the events - from @start to @stop. This array should be freed - with g_free() when you are finished using it. - - - - - - - - -Pango Interaction - - - - - - - - - - -Returns the union of two regions. -This is all pixels in either of @source1 or @source2. +Subtracts one region from another. +The result is a region containing all the pixels which are in @source1, but +which are not in @source2. @source1: a #GdkRegion. -@source2: a #GdkRegion. -@Returns: the union of @source1 and @source2. +@source2: a #GdkRegion to subtract from @source1. +@Returns: @source1 - @source2. @@ -193,6 +158,27 @@ they will be ignored. @ytilt: location to store current tilt in the y direction. @mask: location to store the current modifier state. + + + + + + +This macro contains an integer value representing +the device ID for the core pointer device. + + + + + +Sets the mapping of the axes (valuators) of a device +onto the predefined valuator types that GTK+ understands. + + +@deviceid: the device to configure. +@axes: an array of GdkAxisUse. This length of this array + must match the number of axes for the device. + Sets the source type for a device. @@ -201,3 +187,37 @@ Sets the source type for a device. @deviceid: the device to configure @source: the new source type. + +Points, Rectangles and Regions + + + + +Returns the intersection of two regions. + + +@source1: a #GdkRegion. +@source2: a #GdkRegion. +@Returns: the intersection of @source1 and @source2. + + +Keyboard Handling + + + + +Enables or disables a device, and determines how the +device maps onto the screen. + + +@deviceid: the device to configure. +@mode: the new mode. +@Returns: %TRUE if the device supports the given mode, otherwise + %FALSE and the device's mode is unchanged. + + + + + + + diff --git a/docs/reference/gdk/tmpl/keys.sgml b/docs/reference/gdk/tmpl/keys.sgml index 4bd4cfcbc6..006d562a48 100644 --- a/docs/reference/gdk/tmpl/keys.sgml +++ b/docs/reference/gdk/tmpl/keys.sgml @@ -29,6 +29,96 @@ using gdk_keyval_to_upper() and gdk_keyval_to_lower(). + + + + + +@parent_instance: + + + + + + + + + + + + +@keycode: +@group: +@level: + + + + + + +@keycode: +@group: +@level: + + + + + + +@Returns: + + + + + + + +@keymap: +@key: +@Returns: + + + + + + + +@keymap: +@hardware_keycode: +@state: +@group: +@keyval: +@effective_group: +@level: +@unused_modifiers: +@Returns: + + + + + + + +@keymap: +@keyval: +@keys: +@n_keys: +@Returns: + + + + + + + +@keymap: +@hardware_keycode: +@keys: +@keyvals: +@n_entries: +@Returns: + + Converts a key value into a symbolic name. @@ -51,26 +141,6 @@ Converts a key name to a key value. not a valid key. - - -Returns TRUE if the given key value is in upper case. - - -@keyval: a key value. -@Returns: TRUE if @keyval is in upper case, or if @keyval is not subject to -case conversion. - - - - -Returns TRUE if the given key value is in lower case. - - -@keyval: a key value. -@Returns: TRUE if @keyval is in lower case, or if @keyval is not subject to -case conversion. - - @@ -101,6 +171,26 @@ Converts a key value to lower case, if applicable. in lower case or it is not subject to case conversion. + + +Returns TRUE if the given key value is in upper case. + + +@keyval: a key value. +@Returns: TRUE if @keyval is in upper case, or if @keyval is not subject to +case conversion. + + + + +Returns TRUE if the given key value is in lower case. + + +@keyval: a key value. +@Returns: TRUE if @keyval is in lower case, or if @keyval is not subject to +case conversion. + + diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml index 547edb3fe9..b39fa718d4 100644 --- a/docs/reference/gtk/gtk-docs.sgml +++ b/docs/reference/gtk/gtk-docs.sgml @@ -100,7 +100,7 @@ - + @@ -276,7 +276,7 @@ An advanced widget set. >k-GtkTreeStore; >k-GtkTreeViewColumn; >k-GtkTreeView; - >k-GtkModelSimple; + >k-GtkTreeModelSimple; >k-GtkTreeModelSort; >k-GtkCellRenderer; >k-GtkCellRendererPixbuf; diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index 01814ee0e6..8206ca5d98 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -251,7 +251,6 @@ GTK_CLIST_UNSET_FLAG GTK_CLIST_IN_DRAG GTK_CLIST_ROW_HEIGHT_SET GTK_CLIST_SHOW_TITLES -GTK_CLIST_CHILD_HAS_FOCUS GTK_CLIST_ADD_MODE GTK_CLIST_AUTO_SORT GTK_CLIST_AUTO_RESIZE_BLOCKED @@ -276,7 +275,6 @@ GtkCell GtkCListCellInfo GtkCListDestInfo GtkCListDragPos -gtk_clist_construct gtk_clist_new gtk_clist_new_with_titles gtk_clist_set_shadow_type @@ -490,7 +488,6 @@ GtkCTreeCompareDragFunc GtkCTree GtkCTreeRow GtkCTreeNode -gtk_ctree_construct gtk_ctree_new_with_titles gtk_ctree_new gtk_ctree_insert_node @@ -1389,7 +1386,6 @@ GTK_MISC_GET_CLASS gtknotebook GtkNotebook GtkNotebook -GTK_NOTEBOOK_PAGE GtkNotebookPage gtk_notebook_new gtk_notebook_append_page @@ -1445,17 +1441,11 @@ GTK_OBJECT_FLAGS GTK_OBJECT_DESTROYED GTK_OBJECT_FLOATING GTK_OBJECT_CONNECTED -GTK_OBJECT_CONSTRUCTED GTK_OBJECT_SET_FLAGS GTK_OBJECT_UNSET_FLAGS GtkArgFlags GtkObject -gtk_object_class_user_signal_new -gtk_object_class_user_signal_newv gtk_object_new -gtk_object_newv -gtk_object_constructed -gtk_object_default_construct gtk_object_sink gtk_object_ref gtk_object_unref @@ -1463,10 +1453,7 @@ gtk_object_weakref gtk_object_weakunref gtk_object_destroy gtk_object_get -gtk_object_getv gtk_object_set -gtk_object_setv -gtk_object_query_args gtk_object_set_data gtk_object_set_data_full gtk_object_remove_data @@ -1474,7 +1461,6 @@ gtk_object_get_data gtk_object_remove_no_notify gtk_object_set_user_data gtk_object_get_user_data -gtk_object_class_add_signals gtk_object_add_arg_type gtk_object_set_data_by_id gtk_object_set_data_by_id_full @@ -1483,10 +1469,6 @@ gtk_object_remove_data_by_id gtk_object_remove_no_notify_by_id gtk_object_data_try_key gtk_object_data_force_id -gtk_object_arg_set -gtk_object_arg_get -gtk_object_args_collect -gtk_object_arg_get_info GTK_OBJECT GTK_IS_OBJECT @@ -1495,6 +1477,10 @@ gtk_object_get_type GTK_OBJECT_CLASS GTK_IS_OBJECT_CLASS GTK_OBJECT_GET_CLASS + + +GTK_ARG_MASK +GTK_ARG_READWRITE
@@ -2052,6 +2038,8 @@ gtk_text_buffer_copy_clipboard gtk_text_buffer_cut_clipboard gtk_text_buffer_paste_primary gtk_text_buffer_get_selection_bounds +gtk_text_buffer_begin_user_action +gtk_text_buffer_end_user_action GTK_TEXT_BUFFER GTK_IS_TEXT_BUFFER @@ -2060,6 +2048,8 @@ gtk_text_buffer_get_type GTK_TEXT_BUFFER_CLASS GTK_IS_TEXT_BUFFER_CLASS GTK_TEXT_BUFFER_GET_CLASS + +GtkTextLogAttrCache
@@ -2089,14 +2079,20 @@ gtk_text_iter_toggles_tag gtk_text_iter_has_tag gtk_text_iter_get_tags gtk_text_iter_editable +gtk_text_iter_starts_word +gtk_text_iter_ends_word +gtk_text_iter_inside_word gtk_text_iter_starts_line gtk_text_iter_ends_line +gtk_text_iter_is_cursor_position gtk_text_iter_get_chars_in_line +gtk_text_iter_get_bytes_in_line gtk_text_iter_get_attributes +gtk_text_iter_get_language gtk_text_iter_is_last gtk_text_iter_is_first -gtk_text_iter_next_char -gtk_text_iter_prev_char +gtk_text_iter_forward_char +gtk_text_iter_backward_char gtk_text_iter_forward_chars gtk_text_iter_backward_chars gtk_text_iter_forward_line @@ -2107,12 +2103,16 @@ gtk_text_iter_forward_word_ends gtk_text_iter_backward_word_starts gtk_text_iter_forward_word_end gtk_text_iter_backward_word_start +gtk_text_iter_forward_cursor_position +gtk_text_iter_backward_cursor_position +gtk_text_iter_forward_cursor_positions +gtk_text_iter_backward_cursor_positions gtk_text_iter_set_offset gtk_text_iter_set_line gtk_text_iter_set_line_offset gtk_text_iter_set_line_index gtk_text_iter_forward_to_end -gtk_text_iter_forward_to_newline +gtk_text_iter_forward_to_line_end gtk_text_iter_forward_to_tag_toggle gtk_text_iter_backward_to_tag_toggle GtkTextCharPredicate @@ -2135,6 +2135,7 @@ gtk_text_mark_set_visible gtk_text_mark_get_visible gtk_text_mark_get_deleted gtk_text_mark_get_name +gtk_text_mark_get_buffer GTK_TEXT_MARK GTK_IS_TEXT_MARK @@ -2160,6 +2161,7 @@ gtk_text_tag_event GtkTextAppearance gtk_text_attributes_new gtk_text_attributes_copy +gtk_text_attributes_copy_values gtk_text_attributes_unref gtk_text_attributes_ref @@ -2202,15 +2204,10 @@ gtk_text_view_new_with_buffer gtk_text_view_set_buffer gtk_text_view_get_buffer gtk_text_view_scroll_to_mark +gtk_text_view_scroll_mark_onscreen gtk_text_view_move_mark_onscreen gtk_text_view_place_cursor_onscreen gtk_text_view_get_visible_rect -gtk_text_view_set_wrap_mode -gtk_text_view_get_wrap_mode -gtk_text_view_set_editable -gtk_text_view_get_editable -gtk_text_view_set_cursor_visible -gtk_text_view_get_cursor_visible gtk_text_view_get_iter_location gtk_text_view_get_line_at_y gtk_text_view_get_line_yrange @@ -2221,9 +2218,37 @@ gtk_text_view_get_window gtk_text_view_get_window_type gtk_text_view_set_border_window_size gtk_text_view_set_text_window_size +gtk_text_view_forward_display_line +gtk_text_view_backward_display_line +gtk_text_view_forward_display_line_end +gtk_text_view_backward_display_line_start +gtk_text_view_starts_display_line +gtk_text_view_move_visually gtk_text_view_add_child_at_anchor gtk_text_view_add_child_in_window gtk_text_view_move_child +gtk_text_view_set_wrap_mode +gtk_text_view_get_wrap_mode +gtk_text_view_set_editable +gtk_text_view_get_editable +gtk_text_view_set_cursor_visible +gtk_text_view_get_cursor_visible +gtk_text_view_set_pixels_above_lines +gtk_text_view_get_pixels_above_lines +gtk_text_view_set_pixels_below_lines +gtk_text_view_get_pixels_below_lines +gtk_text_view_set_pixels_inside_wrap +gtk_text_view_get_pixels_inside_wrap +gtk_text_view_set_justification +gtk_text_view_get_justification +gtk_text_view_set_left_margin +gtk_text_view_get_left_margin +gtk_text_view_set_right_margin +gtk_text_view_get_right_margin +gtk_text_view_set_indent +gtk_text_view_get_indent +gtk_text_view_set_tabs +gtk_text_view_get_tabs GTK_TEXT_VIEW GTK_IS_TEXT_VIEW @@ -2449,10 +2474,10 @@ GValueCompareFunc gtk_tree_model_sort_new gtk_tree_model_sort_new_with_model gtk_tree_model_sort_set_model -gtk_tree_model_sort_set_sort_col +gtk_tree_model_sort_set_sort_column gtk_tree_model_sort_set_compare -gtk_tree_model_sort_resort gtk_tree_model_sort_convert_path +gtk_tree_model_sort_convert_iter GTK_TREE_MODEL_SORT GTK_IS_TREE_MODEL_SORT @@ -2464,14 +2489,14 @@ GTK_IS_TREE_MODEL_SORT_CLASS
gtktreeselection -GtkTreeSelectionType +GtkTreeSelectionMode GtkTreeSelectionFunc GtkTreeSelectionForeachFunc GtkTreeSelection -gtk_tree_selection_new -gtk_tree_selection_set_type +gtk_tree_selection_set_mode gtk_tree_selection_set_select_function gtk_tree_selection_get_user_data +gtk_tree_selection_get_tree_view gtk_tree_selection_get_selected gtk_tree_selection_selected_foreach gtk_tree_selection_select_path @@ -2481,8 +2506,6 @@ gtk_tree_selection_unselect_iter gtk_tree_selection_select_all gtk_tree_selection_unselect_all gtk_tree_selection_select_range -gtk_tree_selection_new_with_tree_view -gtk_tree_selection_set_tree_view GTK_TREE_SELECTION GTK_IS_TREE_SELECTION @@ -2527,7 +2550,7 @@ GTK_IS_TREE_STORE_CLASS gtktreeviewcolumn GTK_TYPE_TREE_COLUMN GtkTreeViewColumn -GtkTreeViewColumnType +GtkTreeViewColumnSizing GtkTreeViewColumnFunc GtkTreeViewColumn gtk_tree_view_column_new @@ -2538,21 +2561,22 @@ gtk_tree_view_column_set_attributes gtk_tree_view_column_set_cell_data gtk_tree_view_column_set_visible gtk_tree_view_column_get_visible -gtk_tree_view_column_set_col_type +gtk_tree_view_column_set_sizing gtk_tree_view_column_get_col_type gtk_tree_view_column_get_size -gtk_tree_view_column_set_size +gtk_tree_view_column_set_width gtk_tree_view_column_set_min_width gtk_tree_view_column_get_min_width gtk_tree_view_column_set_max_width gtk_tree_view_column_get_max_width gtk_tree_view_column_set_title gtk_tree_view_column_get_title -gtk_tree_view_column_set_header_active +gtk_tree_view_column_set_header_clickable gtk_tree_view_column_set_widget gtk_tree_view_column_get_widget gtk_tree_view_column_set_justification gtk_tree_view_column_get_justification +gtk_tree_view_column_clicked GTK_TREE_VIEW_COLUMN GTK_IS_TREE_VIEW_COLUMN @@ -2579,7 +2603,7 @@ gtk_tree_view_set_vadjustment gtk_tree_view_get_headers_visible gtk_tree_view_set_headers_visible gtk_tree_view_columns_autosize -gtk_tree_view_set_headers_active +gtk_tree_view_set_headers_clickable gtk_tree_view_append_column gtk_tree_view_remove_column gtk_tree_view_insert_column @@ -2602,26 +2626,26 @@ GtkTreeViewPrivate
-gtkmodelsimple -GtkModelSimple -GtkModelSimple -gtk_model_simple_new -gtk_model_simple_node_changed -gtk_model_simple_node_inserted -gtk_model_simple_node_child_toggled -gtk_model_simple_node_deleted +gtktreemodelsimple +GtkTreeModelSimple +GtkTreeModelSimple +gtk_tree_model_simple_new +gtk_tree_model_simple_changed +gtk_tree_model_simple_inserted +gtk_tree_model_simple_child_toggled +gtk_tree_model_simple_deleted -GTK_MODEL_SIMPLE -GTK_IS_MODEL_SIMPLE +GTK_TREE_MODEL_SIMPLE +GTK_IS_TREE_MODEL_SIMPLE GTK_TYPE_MODEL_SIMPLE -gtk_model_simple_get_type -GTK_MODEL_SIMPLE_CLASS -GTK_IS_MODEL_SIMPLE_CLASS +gtk_tree_model_simple_get_type +GTK_TREE_MODEL_SIMPLE_CLASS +GTK_IS_TREE_MODEL_SIMPLE_CLASS
gtkcellrenderer -GtkCellRendererType +GtkCellRendererState GtkCellRenderer GtkCellRenderer gtk_cell_renderer_get_size @@ -2685,6 +2709,8 @@ GTK_IS_CELL_RENDERER_TEXT_PIXBUF_CLASS GtkCellRendererToggle gtk_cell_renderer_toggle_new gtk_cell_renderer_toggle_set_radio +gtk_cell_renderer_toggle_get_active +gtk_cell_renderer_toggle_set_active GTK_CELL_RENDERER_TOGGLE GTK_IS_CELL_RENDERER_TOGGLE @@ -2884,15 +2910,11 @@ GtkSelectionData GtkWidgetAuxInfo GtkWidgetShapeInfo gtk_widget_new -gtk_widget_newv gtk_widget_ref gtk_widget_unref gtk_widget_destroy gtk_widget_destroyed -gtk_widget_get -gtk_widget_getv gtk_widget_set -gtk_widget_setv gtk_widget_unparent gtk_widget_show gtk_widget_show_now @@ -2920,6 +2942,7 @@ gtk_widget_activate gtk_widget_reparent gtk_widget_popup gtk_widget_intersect +gtk_widget_is_focus gtk_widget_grab_focus gtk_widget_grab_default gtk_widget_set_name @@ -3108,6 +3131,7 @@ gtk_key_snooper_remove gtk_get_current_event gtk_get_current_event_time +gtk_get_current_event_state gtk_get_event_widget gtk_propagate_event @@ -3187,26 +3211,24 @@ gtk_draw_shadow gtk_draw_polygon gtk_draw_arrow gtk_draw_diamond -gtk_draw_oval gtk_draw_string gtk_draw_box gtk_draw_box_gap gtk_draw_check -gtk_draw_cross gtk_draw_extension gtk_draw_flat_box gtk_draw_focus gtk_draw_handle gtk_draw_option -gtk_draw_ramp gtk_draw_shadow_gap gtk_draw_slider gtk_draw_tab +gtk_draw_expander +gtk_draw_layout gtk_paint_arrow gtk_paint_box gtk_paint_box_gap gtk_paint_check -gtk_paint_cross gtk_paint_diamond gtk_paint_extension gtk_paint_flat_box @@ -3214,15 +3236,15 @@ gtk_paint_focus gtk_paint_handle gtk_paint_hline gtk_paint_option -gtk_paint_oval gtk_paint_polygon -gtk_paint_ramp gtk_paint_shadow gtk_paint_shadow_gap gtk_paint_slider gtk_paint_string gtk_paint_tab gtk_paint_vline +gtk_paint_expander +gtk_paint_layout GTK_STYLE diff --git a/docs/reference/gtk/gtk.hierarchy b/docs/reference/gtk/gtk.hierarchy index 411ccae3c8..be020e251a 100644 --- a/docs/reference/gtk/gtk.hierarchy +++ b/docs/reference/gtk/gtk.hierarchy @@ -95,6 +95,3 @@ GtkObject GtkIMContext GtkIMMulticontext GtkItemFactory - GtkTextBuffer - GtkTextTag - GtkTextTagTable diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 0f3279409c..28e71fdecb 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -21,6 +21,33 @@ the widget. + + + + + +@simple: +@path: +@iter: + + + + + + +@type: +@nargs: +@args: +@Returns: + + + +A macro to check whether a child widget of the CList +has the focus. + + +@clist: The #GtkCList widget to check. + What are Signal Marshallers? @@ -91,6 +118,16 @@ void marshal_INT__POINTER_POINTER_INT_INT(GtkObject* object, + + +Add an array of signals to a #GtkObjectClass. +Usually this is called when registering a new type of object. + + +@klass: the object class to append signals to. +@signals: the signals to append. +@nsignals: the number of signals being appended. + @@ -119,6 +156,12 @@ void marshal_INT__POINTER_POINTER_INT_INT(GtkObject* object, @Returns: + + + + + + @@ -127,6 +170,14 @@ void marshal_INT__POINTER_POINTER_INT_INT(GtkObject* object, @engine: @Returns: + + + + + +@selection: +@type: + @@ -172,11 +223,13 @@ void marshal_INT__POINTER_POINTER_INT_INT(GtkObject* object, - + +@widget: +@arg: @@ -249,6 +302,13 @@ A structure used to return values from @gtk_type_query. @object_size: @class_size: + + + + + +@v: + @@ -257,13 +317,6 @@ A structure used to return values from @gtk_type_query. @buffer: @Returns: - - - - - -@v: - @@ -328,6 +381,24 @@ to gtk_signal_remove_emission_hook()). @func_data: @args: + + + + + +@simple: +@path: +@iter: + + + + + + +@tree_column: +@size: +@width: + @@ -345,6 +416,15 @@ to gtk_signal_remove_emission_hook()). @x: @y: + + +Gets an array of argument values from an object. + + +@object: the object to get arguments from. +@n_args: the number of arguments to query. +@args: the arguments to fill in. + @@ -379,12 +459,29 @@ Get the type of GtkIdentifier. @name: @Returns: + + + + + +@parent: +@stamp: + + + + + + +@simple: +@path: +@iter: + @@ -412,6 +509,15 @@ Get the type of GtkIdentifier. @func_data: @args: + + + + + +@GTK_CELL_RENDERER_SELECTED: +@GTK_CELL_RENDERER_PRELIT: +@GTK_CELL_RENDERER_INSENSITIVE: + @@ -448,6 +554,15 @@ applications. @is_editable: %TRUE if the user is allowed to edit the text in the widget. + + + + + +@simple: +@path: +@iter: + This signal is emitted when text is deleted from @@ -519,6 +634,15 @@ Menu Factory @widget: @visual: + + + + + +@widget: +@nargs: +@args: + @@ -572,6 +696,14 @@ Convert a gtk type into its sequence number + + + + + +@iter: +@Returns: + @@ -590,6 +722,12 @@ Convert a gtk type into its sequence number @engine: + + + + + + Deprecated. @@ -606,12 +744,6 @@ Deprecated. @func_data: @args: - - - - - - @@ -656,12 +788,36 @@ Control-Return for #GtkText.) @func_data: @args: + + +Pixel width of the left margin of the text for lines after the first +line in a wrapped paragraph. + + + + + + + + +@style: +@window: +@state_type: +@shadow_type: +@area: +@widget: +@detail: +@x: +@y: +@width: +@height: + @@ -677,6 +833,18 @@ be copied to the clipboard. @editable: the object which received the signal. + + +Initializes a previously allocated #GtkCList widget for use. This should not +normally be used to create a #GtkCList widget. Use gtk_clist_new() instead. + + +@clist: A pointer to an uninitialized #GtkCList widget. +@columns: The number of columns the #GtkCList should have. +@titles: An array of strings that should be used as the titles i +of the columns. There should be enough strings in the array for +the number of columns specified. + @@ -769,6 +937,20 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_CALLBACK + + +Private: Gets an array of #GtkArgs from a va_list C structure. + + +@object_type: the type of object to collect arguments for. +@arg_list_p: pointer to be filled in with a list of parsed arguments. +@info_list_p: optional pointer for a returned list #GtkArgInfos. +@first_arg_name: name of first argument. +@var_args: value of first argument, followed by more key/value pairs, +terminated by NULL. +@Returns: an error message, or NULL on success. +It is the caller's responsibility to call g_free() in the event of error. + A set of bit flags used to specify the type of fonts shown @@ -794,6 +976,15 @@ Get the number of signals defined by this object. @obj: the object to query. + + +Private function to get an argument and argument info from an object. + + +@object: the object whose argument should be retrieved. +@arg: the argument, for the name on input, the rest is filled on output. +@info: a #GtkArgInfo structure to optionally fill in. + @@ -860,6 +1051,20 @@ Set the mem_chunk size so it will hold @n_chunks of the objects of that @type. @type: There must be an unlocked TypeNode associated with this type otherwise nothing happens. @n_chunks: + + + + + +@style: +@window: +@state_type: +@shadow_type: +@x: +@y: +@width: +@height: + The first structured enumerated type value. @@ -977,6 +1182,13 @@ An action signal. Delete a single word. + + +Test whether a GtkObject's arguments have been prepared. + + +@obj: the object to examine. + Sets one of the two font filters, to limit the fonts shown. @@ -1018,12 +1230,6 @@ will be shown, or NULL to show all charsets. @Returns: - - - - - - No idea. @@ -1048,6 +1254,14 @@ The last "flat" (no struct) enumerated type value. + + + + + +@selection: +@tree_view: + @@ -1086,13 +1300,6 @@ This function is labeled private. @object: the object whose signal handlers should be destroyed. - - -Pixel width of the left margin of the text for lines after the first -line in a wrapped paragraph. - - - @@ -1146,6 +1353,29 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN @a: + + +Define a signal-handler for a new signal on an already defined +object. + + +See the signal documentation for more general information. + + +@klass: the object class to define the signal for. +@name: the name of the signal. +@signal_flags: the default emission behavior for the signal. +See gtk_signal_new(). +@marshaller: a function that will take an array of GtkArgs +and invoke the appropriate handler with the normal calling +conventions. +@return_val: specify the return-value type for the signal +(or GTK_TYPE_NONE for no return-value). +@nparams: specify the number of parameters the signal +receives from the caller of gtk_signal_emit(). +@Varargs: list of nparams #GtkTypes to pass to the signal handlers. +@Returns: the signal id. (See #GtkSignals) + @@ -1168,6 +1398,16 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN @ruler: the gtkruler + + +Construct an object with an array of arguments. + + +@object_type: the type of the object to create. +@n_args: the number of arguments to set. +@args: an array of n_args arguments (which are name and value pairs). +@Returns: the new GtkObject. + @@ -1175,6 +1415,14 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_FOREIGN @obj: + + + + + +@iter: +@Returns: + @@ -1203,6 +1451,15 @@ Given a type, return various interesting parameters of the type. @type: GtkType @Returns: GtkTypeQuery* + + + + + +@GTK_TREE_VIEW_COLUMN_RESIZEABLE: +@GTK_TREE_VIEW_COLUMN_AUTOSIZE: +@GTK_TREE_VIEW_COLUMN_FIXED: + @@ -1231,6 +1488,30 @@ Hide the name of gtk_identifier_get_type + + +This function is not usually used by users. + + +@ctree: +@columns: +@tree_column: +@titles: + + + + + + +@style: +@window: +@state_type: +@shadow_type: +@x: +@y: +@width: +@height: + Returns whether a connection id is valid (and optionally not blocked). @@ -1243,6 +1524,13 @@ handler. @Returns: TRUE if the signal exists and wasn't blocked, unless #may_be_blocked was specified. FALSE otherwise. + + + + + +@Returns: + @@ -1250,6 +1538,13 @@ unless #may_be_blocked was specified. FALSE otherwise. @wid: + + + + + +@Returns: + @@ -1300,6 +1595,12 @@ Given the type of an object and a pointer to it, the object is freed. Private Information + + +The position of the cursor. + + + @@ -1348,6 +1649,36 @@ position. @window: @xid: + + + + + +@tree_column: +@active: + + + +Define a signal-handler for a new signal on an already defined +object. + + +@klass: the object class to define the signal for. +@name: the name of the signal. +@signal_flags: the default emission behavior for the signal. +See gtk_signal_new(). +@marshaller: takes a GtkObject, a #GtkSignalFunc, and an array +of arguments, and invokes the function using the appropriate +calling conventions. Usually just select a function +out of gtkmarshal.h. +@return_val: specify the return-value type for the signal (possibly +#GTK_TYPE_NONE). +@nparams: specify the number of parameters the signal +receives from the caller of gtk_signal_emit(). +@params: array of #GtkTypes the signal handlers for this signal +should have in their prototype (of length nparams). +@Returns: the signal id. (See #GtkSignals) + @@ -1451,6 +1782,15 @@ cursor. (Can be negative). @type: @action: + + +Private function to set an argument and argument info to an object. + + +@object: the object whose argument should be set. +@arg: the argument. +@info: infomation about this type of argument in general. + @@ -1483,6 +1823,22 @@ The first "flat" (no struct) enumerated type value. + + + + + +@widget: +@nargs: +@args: + + + + + + +@tree_model_sort: + @@ -1491,6 +1847,45 @@ The first "flat" (no struct) enumerated type value. @type: @Returns: + + +Mark an allocated object as constructed. +This is used for situations +that require precise control of the construction process. + + +This is done when gtk_object_default_construct() is inadequate. +In #GtkCList the need arises because #GtkCList does construction work that +must happen after its derivers. This work +cannot be done in an initializer function, so an alternate +constructor is mandatory. It calls gtk_object_constructed() to +indicate it has done its job, so that no other constructor will +be invoked. + + +Normally this function is just automatically run from +gtk_object_default_construct(). + + +@object: object which has been constructed. This is usually +done automatically by gtk_object_new() and gtk_object_newv(). + + + +This function is called to construct arguments that haven't been initialized +but have the #GTK_ARG_CONSTRUCT flag set. + + +All number arguments are set to 0. All pointers and strings +are set to NULL. + + +Normally invoked by gtk_object_new() automatically; gtk_type_new() can +be used to bypass it. + + +@object: the object to initialize. + @@ -1504,6 +1899,39 @@ The first "flat" (no struct) enumerated type value. @buffer: + + + + + + + + +Query information about an argument type. + + +@object_type: type of object to query about. +@arg_name: name of the argument. +@info_p: pointer to be filled in with a pointer to the GtkArgInfo. +@Returns: an error message, or NULL on success. +It is the caller's responsibility to call g_free() in the event of error. + + + + + + +@GTK_TREE_SELECTION_SINGLE: +@GTK_TREE_SELECTION_MULTI: + + + +Setting this with a GtkType of GTK_TYPE_SIGNAL connects +the signal to the object, so that the signal is always run +after other user handlers and the default handler. + + + @@ -1530,6 +1958,16 @@ Causes the "changed" signal to be emitted. @editable: a #GtkEditable widget. + + +Set an array of arguments. + + +@object: the object whose arguments should be set. +@n_args: the number of arguments to set. +@args: the desired values, as an array of #GtkArgs (which contain +the names, types, and values of the arguments). + @@ -1615,6 +2053,24 @@ Get the array of signals defined for this object. @obj: the object to fetch the signals from. + + +Get all the arguments that may be used for a given type. + + +In Java, this type of mechanism is called +introspection. It is used by applications +like Glade, that have to determine what can be done to an object +at run-time. + + +@class_type: the GtkType of the ObjectClass +(returned from GTK_OBJECT_CLASS(class)->type for example). +@arg_flags: if non-NULL, obtains the #GtkArgFlags that apply to +each argument. You must g_free() this if you request it. +@n_args: the number of arguments is returned in this field. +@Returns: an array of arguments, that you must deallocate with g_free(). + An action signal. Move the cursor to the given column. @@ -1656,6 +2112,14 @@ make sure that it's okay to cast @type_object into a @cast_type. @cast_type: GtkType @Returns: the same GtkTypeObject* as @type_object + + + + + +@tree_model_sort: +@sort_col: + @@ -1673,12 +2137,6 @@ make sure that it's okay to cast @type_object into a @cast_type. @func_data: @args: - - -The position of the cursor. - - - @@ -1710,6 +2168,18 @@ sure that it's okay to cast something of that @klass into a @cast_type. @cast_type: GtkType @Returns: Always return @klass. + + +Setting this with a GtkType of GTK_TYPE_SIGNAL connects +the signal to the object, so that the user data and objects +and swapped when the signal handler is invoked, +and so that the handler is invoked after all others. + + +See gtk_signal_connect_object_after() for more details. + + + @@ -1717,6 +2187,24 @@ sure that it's okay to cast something of that @klass into a @cast_type. @factory: + + + + + +@style: +@window: +@state_type: +@shadow_type: +@area: +@widget: +@detail: +@arrow_type: +@x: +@y: +@width: +@height: + Find out the recursion depth of emissions for a particular type @@ -1813,6 +2301,30 @@ May be NULL. @Returns: + + + + + +@style: +@window: +@state_type: +@shadow_type: +@area: +@widget: +@detail: +@x: +@y: +@width: +@height: + + + +Setting this with a GtkType of GTK_TYPE_SIGNAL connects +the signal to the object. + + + Print the types @type inherits from. @@ -1883,6 +2395,24 @@ destroyed. @window: @defaultw: + + + + + +@textbuffer: the object which received the signal. +@arg1: +@arg2: +@arg3: + + + + + + +@tree_view: +@Returns: + @@ -1893,6 +2423,35 @@ destroyed. @func_data: @args: + + +Setting this with a GtkType of GTK_TYPE_SIGNAL connects +the signal to the object, so that the user data and objects +and swapped when the signal handler is invoked. + + +This is useful for handlers that are primarily notifying +other objects and could just invoke an already existing function +if the parameters were swapped. +See gtk_signal_connect_object() for more details. + + + + + + + + +@style: +@window: +@state_type: +@shadow_type: +@arrow_type: +@x: +@y: +@width: +@height: + @@ -1923,6 +2482,20 @@ destroyed. @func_data: @args: + + + + + +@tree_column: +@type: + + + + + + + @@ -1953,6 +2526,14 @@ destroyed. @func_data: @args: + + + + + +@widget: the object which received the signal. +@area: + @@ -2012,12 +2593,11 @@ object. @arg1: @arg2: - + -@container: @@ -2027,11 +2607,12 @@ object. @v: @visual: - + +@container: GtkIMContextSimple @@ -2043,12 +2624,6 @@ GtkIMContextSimple - - - - - - Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_CALLBACK @@ -2082,6 +2657,14 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_CALLBACK + + + + + +@tree_view: +@active: + @@ -2112,6 +2695,14 @@ Use to get the value of a GtkArg whose GtkType is GTK_TYPE_C_CALLBACK @GTK_TEXT_SCROLL_PAGE_DOWN: @GTK_TEXT_SCROLL_PAGE_UP: + + + + + +@iter: +@Returns: + diff --git a/docs/reference/gtk/tmpl/gtkaccellabel.sgml b/docs/reference/gtk/tmpl/gtkaccellabel.sgml index 7676b5c705..07710fe4d9 100644 --- a/docs/reference/gtk/tmpl/gtkaccellabel.sgml +++ b/docs/reference/gtk/tmpl/gtkaccellabel.sgml @@ -125,7 +125,7 @@ accelerators are added or removed from the associated widget. @Returns: always returns FALSE. - + The widget whose accelerators are to be shown by the #GtkAccelLabel. diff --git a/docs/reference/gtk/tmpl/gtkarrow.sgml b/docs/reference/gtk/tmpl/gtkarrow.sgml index dd3eaf25bb..fc40e3dcc0 100644 --- a/docs/reference/gtk/tmpl/gtkarrow.sgml +++ b/docs/reference/gtk/tmpl/gtkarrow.sgml @@ -77,12 +77,12 @@ Sets the direction and style of the #GtkArrow, @arrow. @shadow_type: a valid #GtkShadowType. - + the arrow direction, one of #GtkArrowType. - + the arrow style, one of #GtkShadowType. diff --git a/docs/reference/gtk/tmpl/gtkaspectframe.sgml b/docs/reference/gtk/tmpl/gtkaspectframe.sgml index bac6976d54..4f01f1aed2 100644 --- a/docs/reference/gtk/tmpl/gtkaspectframe.sgml +++ b/docs/reference/gtk/tmpl/gtkaspectframe.sgml @@ -78,7 +78,7 @@ to 1.0 (right aligned) - + diff --git a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml index b94a574895..cafd4fb01e 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderer.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderer.sgml @@ -14,7 +14,7 @@ GtkCellRenderer - + diff --git a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml index 96dc1bb05d..ae99e4d4a9 100644 --- a/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml +++ b/docs/reference/gtk/tmpl/gtkcellrenderertoggle.sgml @@ -38,3 +38,21 @@ GtkCellRendererToggle @radio: + + + + + +@toggle: +@Returns: + + + + + + + +@toggle: +@setting: + + diff --git a/docs/reference/gtk/tmpl/gtkclist.sgml b/docs/reference/gtk/tmpl/gtkclist.sgml index 76cdb5b4f2..ae1485a7d9 100644 --- a/docs/reference/gtk/tmpl/gtkclist.sgml +++ b/docs/reference/gtk/tmpl/gtkclist.sgml @@ -97,15 +97,6 @@ widget's column titles is set. @clist: The #GtkCList widget to check. - - -A macro to check whether a child widget of the CList -has the focus. - - -@clist: The #GtkCList widget to check. - - A macro to test whether the CList is in "add mode." @@ -345,19 +336,6 @@ An enumeration for drag operations. @GTK_CLIST_DRAG_INTO: @GTK_CLIST_DRAG_AFTER: - - -Initializes a previously allocated #GtkCList widget for use. This should not -normally be used to create a #GtkCList widget. Use gtk_clist_new() instead. - - -@clist: A pointer to an uninitialized #GtkCList widget. -@columns: The number of columns the #GtkCList should have. -@titles: An array of strings that should be used as the titles i -of the columns. There should be enough strings in the array for -the number of columns specified. - - Creates a new #GtkCList widget for use. @@ -1279,22 +1257,22 @@ previously selected row in a "single" or "browse" mode CList. @column: The column where the selection occured. @event: - + An integer value for a column. - + Sets the shadowing for the CList. - + Sets the type of selection mode for the CList. - + An integer value representing the height of a row in pixels. @@ -1305,19 +1283,19 @@ A boolean value for determining if the user can re-order the CList's columns. - + A boolean value for setting whether the column titles can be clicked. - + A boolean value for setting whether to use icons during drag operations. - + diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml index dfcf2a9923..ec674dea8f 100644 --- a/docs/reference/gtk/tmpl/gtkcontainer.sgml +++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml @@ -380,12 +380,12 @@ GtkContainer @container: the object which received the signal. @widget: - + - + @@ -395,7 +395,7 @@ GtkContainer - + diff --git a/docs/reference/gtk/tmpl/gtkctree.sgml b/docs/reference/gtk/tmpl/gtkctree.sgml index 88f4e86500..c9716105fd 100644 --- a/docs/reference/gtk/tmpl/gtkctree.sgml +++ b/docs/reference/gtk/tmpl/gtkctree.sgml @@ -406,17 +406,6 @@ as the functions below to access it. @list: - - -This function is not usually used by users. - - -@ctree: -@columns: -@tree_column: -@titles: - - Create a new #GtkCTree widget with the given titles for the columns. @@ -1220,12 +1209,12 @@ Emitted when a node is unselected. @node: The node corresponding to the selected row. @column: - + The number of columns in the tree. - + The column in which the actual tree graphic appears. @@ -1240,17 +1229,17 @@ The number of pixels to indent the tree levels. The number of pixels between the tree and the columns. - + FIXME - + The style of the lines in the tree graphic. - + The style of the expander buttons. diff --git a/docs/reference/gtk/tmpl/gtkcurve.sgml b/docs/reference/gtk/tmpl/gtkcurve.sgml index 2c3b78e011..919f6295f5 100644 --- a/docs/reference/gtk/tmpl/gtkcurve.sgml +++ b/docs/reference/gtk/tmpl/gtkcurve.sgml @@ -123,27 +123,27 @@ calling gtk_curve_reset() or gtk_curve_set_gamma(). @curve: the object which received the signal. - + - + - + - + - + diff --git a/docs/reference/gtk/tmpl/gtkentry.sgml b/docs/reference/gtk/tmpl/gtkentry.sgml index 6c95fceab0..7e5111e1db 100644 --- a/docs/reference/gtk/tmpl/gtkentry.sgml +++ b/docs/reference/gtk/tmpl/gtkentry.sgml @@ -268,7 +268,7 @@ to fit. @entry: the object which received the signal. - + @@ -278,7 +278,7 @@ to fit. - + Determines the maximum allowed length of the contents of the widget. See gtk_entry_set_max_length(). @@ -290,7 +290,7 @@ Determines whether the contents of the entry widget are visible or not. See gtk_entry_set_visibility(). - + diff --git a/docs/reference/gtk/tmpl/gtkenums.sgml b/docs/reference/gtk/tmpl/gtkenums.sgml index 33beb4c95e..162f9300ba 100644 --- a/docs/reference/gtk/tmpl/gtkenums.sgml +++ b/docs/reference/gtk/tmpl/gtkenums.sgml @@ -147,8 +147,8 @@ Used for justifying the text inside a #GtkLabel widget. (See also -@GTK_MOVEMENT_CHARS: -@GTK_MOVEMENT_POSITIONS: +@GTK_MOVEMENT_LOGICAL_POSITIONS: +@GTK_MOVEMENT_VISUAL_POSITIONS: @GTK_MOVEMENT_WORDS: @GTK_MOVEMENT_DISPLAY_LINES: @GTK_MOVEMENT_DISPLAY_LINE_ENDS: diff --git a/docs/reference/gtk/tmpl/gtkframe.sgml b/docs/reference/gtk/tmpl/gtkframe.sgml index 0547a0ee1f..077699e7d7 100644 --- a/docs/reference/gtk/tmpl/gtkframe.sgml +++ b/docs/reference/gtk/tmpl/gtkframe.sgml @@ -83,12 +83,12 @@ Set the shadow type for the Frame widget. - + - + diff --git a/docs/reference/gtk/tmpl/gtkhandlebox.sgml b/docs/reference/gtk/tmpl/gtkhandlebox.sgml index f4f15b7ce4..c5a38131dc 100644 --- a/docs/reference/gtk/tmpl/gtkhandlebox.sgml +++ b/docs/reference/gtk/tmpl/gtkhandlebox.sgml @@ -155,12 +155,12 @@ handlebox are detached from the main window. Determines the shadow type for the handlebox. - + Determines the side of the handlebox where the handle is drawn. - + Determines the snap edge of a handlebox. The snap edge is the edge of the detached child that must be aligned diff --git a/docs/reference/gtk/tmpl/gtklist.sgml b/docs/reference/gtk/tmpl/gtklist.sgml index eb528cfea8..4eaf3e4684 100644 --- a/docs/reference/gtk/tmpl/gtklist.sgml +++ b/docs/reference/gtk/tmpl/gtklist.sgml @@ -355,7 +355,7 @@ The child @widget has just been unselected. @list: the object which received the signal. @widget: the newly unselected child. - + diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml index b4e8506f81..1c7a5e215f 100644 --- a/docs/reference/gtk/tmpl/gtkmain.sgml +++ b/docs/reference/gtk/tmpl/gtkmain.sgml @@ -643,6 +643,15 @@ This macro is deprecated. You should use G_PRIORITY_LOW instead. @Returns: + + + + + +@state: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml index a51536f49d..9e22ef178c 100644 --- a/docs/reference/gtk/tmpl/gtknotebook.sgml +++ b/docs/reference/gtk/tmpl/gtknotebook.sgml @@ -41,6 +41,7 @@ will be a popup menu allowing the users to switch pages. The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook. + @@ -52,28 +53,28 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook. -@notebook: -@child: -@tab_label: +@notebook: +@child: +@tab_label: -@notebook: -@child: -@tab_label: -@menu_label: +@notebook: +@child: +@tab_label: +@menu_label: -@notebook: -@child: the -@tab_label: +@notebook: +@child: the +@tab_label: @@ -82,29 +83,29 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook. @notebook: @child: -@tab_label: -@menu_label: +@tab_label: +@menu_label: -@notebook: -@child: -@tab_label: -@position: +@notebook: +@child: +@tab_label: +@position: -@notebook: -@child: -@tab_label: +@notebook: +@child: +@tab_label: @menu_label: -@position: +@position: @@ -112,7 +113,7 @@ The #GtkNotebookPage is an opaque implementation detail of #GtkNotebook. @notebook: -@page_num: +@page_num: @@ -126,31 +127,31 @@ Compatibility macro; in gtkcompat.h. -@notebook: -@child: -@Returns: +@notebook: +@child: +@Returns: -@notebook: -@page_num: +@notebook: +@page_num: -@notebook: +@notebook: -@notebook: +@notebook: @@ -158,8 +159,11 @@ Compatibility macro; in gtkcompat.h. @notebook -@child: -@position: + +@notebook: +@child: +@position: + @@ -173,46 +177,47 @@ Compatibility macro; in gtkcompat.h. -@notebook: -@show_tabs: +@notebook: +@show_tabs: -@notebook: -@show_border: +@notebook: +@show_border: -@notebook: -@scrollable: +@notebook: +@scrollable: -@notebook: -@border_width: +@notebook: +@border_width: -@notebook: +@notebook: -@notebook: +@notebook: + @@ -235,37 +240,37 @@ Compatibility macro; in gtkcompat.h. -@notebook: -@page_num: -@Returns: +@notebook: +@page_num: +@Returns: -@notebook: -@child: -@Returns: +@notebook: +@child: +@Returns: -@notebook: -@child: -@expand: -@fill: -@pack_type: +@notebook: +@child: +@expand: +@fill: +@pack_type: -@notebook: -@homogeneous: +@notebook: +@homogeneous: @@ -281,14 +286,17 @@ Compatibility macro; in gtkcompat.h. +@notebook: +@child: +@menu_text: -@notebook: -@tab_hborder: +@notebook: +@tab_hborder: @@ -296,8 +304,8 @@ Compatibility macro; in gtkcompat.h. @notebook: -@child: -@tab_label: +@child: +@tab_label: @@ -306,9 +314,9 @@ Compatibility macro; in gtkcompat.h. @notebook: @child: -@expand: +@expand: @fill: -@pack_type: +@pack_type: @@ -324,8 +332,8 @@ Compatibility macro; in gtkcompat.h. -@notebook: -@tab_vborder: +@notebook: +@tab_vborder: @@ -342,32 +350,32 @@ Emitted when the user or a function changes the current page. The current page - + The edge at which the tabs for switching pages are drawn. - + Whether the tab labels have a border on all sides. - + Whether the tab labels have a horizontal border. - + Whether the tab labels have a vertical border. - + Whether to show tabs for the notebook pages. - + Whether to draw a bevel around the noteobook. @@ -378,7 +386,7 @@ Whether the tab label area will have arrows for scrolling if there are too many tabs to fit in the area. - + Whether the popup menu for switching pages is enabled. diff --git a/docs/reference/gtk/tmpl/gtkobject.sgml b/docs/reference/gtk/tmpl/gtkobject.sgml index 9857e288c1..18a7eace9b 100644 --- a/docs/reference/gtk/tmpl/gtkobject.sgml +++ b/docs/reference/gtk/tmpl/gtkobject.sgml @@ -210,9 +210,8 @@ there own references, if they believe they are nearly primary ownership of the object. GTK_CONNECTED: refers to whether are signals are connected to this object. -@GTK_RESERVED: -@GTK_CONSTRUCTED: refers to whether the arguments for this object are -ready. +@GTK_RESERVED_1: +@GTK_RESERVED_2: @@ -249,14 +248,6 @@ Test whether a GtkObject has had a signal connected to it. @obj: the object to examine. - - -Test whether a GtkObject's arguments have been prepared. - - -@obj: the object to examine. - - Turn on certain object flags. (Private) @@ -289,55 +280,6 @@ set. Hence this flag is not allowed with #GTK_ARG_WRITABLE, and is redundant with #GTK_ARG_CONSTRUCT. @GTK_ARG_CHILD_ARG: an argument type that applies to (and may be different for) each child. Used by #GtkContainer. -@GTK_ARG_MASK: the bitwise-OR of all the flags. -@GTK_ARG_READWRITE: the argument is readable and writable. - - - -Define a signal-handler for a new signal on an already defined -object. - - -See the signal documentation for more general information. - - -@klass: the object class to define the signal for. -@name: the name of the signal. -@signal_flags: the default emission behavior for the signal. -See gtk_signal_new(). -@marshaller: a function that will take an array of GtkArgs -and invoke the appropriate handler with the normal calling -conventions. -@return_val: specify the return-value type for the signal -(or GTK_TYPE_NONE for no return-value). -@nparams: specify the number of parameters the signal -receives from the caller of gtk_signal_emit(). -@Varargs: list of nparams #GtkTypes to pass to the signal handlers. -@Returns: the signal id. (See #GtkSignals) - - - - -Define a signal-handler for a new signal on an already defined -object. - - -@klass: the object class to define the signal for. -@name: the name of the signal. -@signal_flags: the default emission behavior for the signal. -See gtk_signal_new(). -@marshaller: takes a GtkObject, a #GtkSignalFunc, and an array -of arguments, and invokes the function using the appropriate -calling conventions. Usually just select a function -out of gtkmarshal.h. -@return_val: specify the return-value type for the signal (possibly -#GTK_TYPE_NONE). -@nparams: specify the number of parameters the signal -receives from the caller of gtk_signal_emit(). -@params: array of #GtkTypes the signal handlers for this signal -should have in their prototype (of length nparams). -@Returns: the signal id. (See #GtkSignals) - @@ -348,63 +290,13 @@ function. @type: the type identifying this object. Returned by gtk_type_unique() although (for a properly-written object it should be accessible through #GTK_TYPE_FOO.) -@first_arg_name: name of the first argument to set when constructing -the object. +@first_property_name: @Varargs: the first argument's value, followed by any number of name/argument-value pairs, terminated with NULL. @Returns: the new GtkObject. - - - - -Construct an object with an array of arguments. - - -@object_type: the type of the object to create. -@n_args: the number of arguments to set. -@args: an array of n_args arguments (which are name and value pairs). -@Returns: the new GtkObject. - - - - -Mark an allocated object as constructed. -This is used for situations -that require precise control of the construction process. - - -This is done when gtk_object_default_construct() is inadequate. -In #GtkCList the need arises because #GtkCList does construction work that -must happen after its derivers. This work -cannot be done in an initializer function, so an alternate -constructor is mandatory. It calls gtk_object_constructed() to -indicate it has done its job, so that no other constructor will -be invoked. - - -Normally this function is just automatically run from -gtk_object_default_construct(). - - -@object: object which has been constructed. This is usually -done automatically by gtk_object_new() and gtk_object_newv(). - - - - -This function is called to construct arguments that haven't been initialized -but have the #GTK_ARG_CONSTRUCT flag set. - - -All number arguments are set to 0. All pointers and strings -are set to NULL. - - -Normally invoked by gtk_object_new() automatically; gtk_type_new() can -be used to bypass it. - - -@object: the object to initialize. + +@first_arg_name: name of the first argument to set when constructing +the object. @@ -501,18 +393,10 @@ See gtk_object_unref(). @object: -@first_arg_name: +@first_property_name: @Varargs: - - - - -Gets an array of argument values from an object. - - -@object: the object to get arguments from. -@n_args: the number of arguments to query. -@args: the arguments to fill in. + +@first_arg_name: @@ -537,39 +421,11 @@ void set_box_properties(GtkBox* box) @object: the object whose arguments should be set. -@first_arg_name: the name of the first argument to set. +@first_property_name: @Varargs: the value of the first argument, followed optionally by more name/value pairs, followed by NULL. - - - - -Set an array of arguments. - - -@object: the object whose arguments should be set. -@n_args: the number of arguments to set. -@args: the desired values, as an array of #GtkArgs (which contain -the names, types, and values of the arguments). - - - - -Get all the arguments that may be used for a given type. - - -In Java, this type of mechanism is called -introspection. It is used by applications -like Glade, that have to determine what can be done to an object -at run-time. - - -@class_type: the GtkType of the ObjectClass -(returned from GTK_OBJECT_CLASS(class)->type for example). -@arg_flags: if non-NULL, obtains the #GtkArgFlags that apply to -each argument. You must g_free() this if you request it. -@n_args: the number of arguments is returned in this field. -@Returns: an array of arguments, that you must deallocate with g_free(). + +@first_arg_name: the name of the first argument to set. @@ -670,17 +526,6 @@ writing applications. @Returns: the user data field for object. - - -Add an array of signals to a #GtkObjectClass. -Usually this is called when registering a new type of object. - - -@klass: the object class to append signals to. -@signals: the signals to append. -@nsignals: the number of signals being appended. - - Add a new type of argument to an object class. @@ -802,53 +647,6 @@ so it is good to use this macro. - - -Private function to set an argument and argument info to an object. - - -@object: the object whose argument should be set. -@arg: the argument. -@info: infomation about this type of argument in general. - - - - -Private function to get an argument and argument info from an object. - - -@object: the object whose argument should be retrieved. -@arg: the argument, for the name on input, the rest is filled on output. -@info: a #GtkArgInfo structure to optionally fill in. - - - - -Private: Gets an array of #GtkArgs from a va_list C structure. - - -@object_type: the type of object to collect arguments for. -@arg_list_p: pointer to be filled in with a list of parsed arguments. -@info_list_p: optional pointer for a returned list #GtkArgInfos. -@first_arg_name: name of first argument. -@var_args: value of first argument, followed by more key/value pairs, -terminated by NULL. -@Returns: an error message, or NULL on success. -It is the caller's responsibility to call g_free() in the event of error. - - - - -Query information about an argument type. - - -@object_type: type of object to query about. -@arg_name: name of the argument. -@info_p: pointer to be filled in with a pointer to the GtkArgInfo. -@Returns: an error message, or NULL on success. -It is the caller's responsibility to call g_free() in the event of error. - - Indicates that an object is being destroyed. @@ -856,45 +654,8 @@ Indicates that an object is being destroyed. @object: the object which received the signal. - + A pointer for convenience when programming applications. - - -Setting this with a GtkType of GTK_TYPE_SIGNAL connects -the signal to the object. - - - - -Setting this with a GtkType of GTK_TYPE_SIGNAL connects -the signal to the object, so that the signal is always run -after other user handlers and the default handler. - - - - -Setting this with a GtkType of GTK_TYPE_SIGNAL connects -the signal to the object, so that the user data and objects -and swapped when the signal handler is invoked. - - -This is useful for handlers that are primarily notifying -other objects and could just invoke an already existing function -if the parameters were swapped. -See gtk_signal_connect_object() for more details. - - - - -Setting this with a GtkType of GTK_TYPE_SIGNAL connects -the signal to the object, so that the user data and objects -and swapped when the signal handler is invoked, -and so that the handler is invoked after all others. - - -See gtk_signal_connect_object_after() for more details. - - diff --git a/docs/reference/gtk/tmpl/gtkoldeditable.sgml b/docs/reference/gtk/tmpl/gtkoldeditable.sgml index b7fc2edbb6..c59280ccfc 100644 --- a/docs/reference/gtk/tmpl/gtkoldeditable.sgml +++ b/docs/reference/gtk/tmpl/gtkoldeditable.sgml @@ -179,7 +179,7 @@ GtkOldEditable @oldeditable: the object which received the signal. @arg1: - + diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml index c659448942..2e15eeb0c1 100644 --- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml @@ -78,3 +78,10 @@ selected value for the option menu. @Returns: + + + + + +@optionmenu: the object which received the signal. + diff --git a/docs/reference/gtk/tmpl/gtkpacker.sgml b/docs/reference/gtk/tmpl/gtkpacker.sgml index 3302b5d06f..c2bdafecc5 100644 --- a/docs/reference/gtk/tmpl/gtkpacker.sgml +++ b/docs/reference/gtk/tmpl/gtkpacker.sgml @@ -192,27 +192,27 @@ GtkPacker - + - + - + - + - + diff --git a/docs/reference/gtk/tmpl/gtkpaned.sgml b/docs/reference/gtk/tmpl/gtkpaned.sgml index 59a5511b73..96672e06a4 100644 --- a/docs/reference/gtk/tmpl/gtkpaned.sgml +++ b/docs/reference/gtk/tmpl/gtkpaned.sgml @@ -178,7 +178,7 @@ Set the the handle size to @size x @size pixels. @Returns: - + diff --git a/docs/reference/gtk/tmpl/gtkprogress.sgml b/docs/reference/gtk/tmpl/gtkprogress.sgml index f67d36e6e3..e9faae556f 100644 --- a/docs/reference/gtk/tmpl/gtkprogress.sgml +++ b/docs/reference/gtk/tmpl/gtkprogress.sgml @@ -186,22 +186,22 @@ the #GtkProgress. @max: the maximum progress value. - + A boolean indicating whether activity mode is enabled. - + A boolean indicating whether the progress is shown as text. - + A number between 0.0 and 1.0 specifying the horizontal alignment. - + A number between 0.0 and 1.0 specifying the vertical alignment. diff --git a/docs/reference/gtk/tmpl/gtkprogressbar.sgml b/docs/reference/gtk/tmpl/gtkprogressbar.sgml index 3e44bb019e..4492a98be2 100644 --- a/docs/reference/gtk/tmpl/gtkprogressbar.sgml +++ b/docs/reference/gtk/tmpl/gtkprogressbar.sgml @@ -236,24 +236,24 @@ a #GtkProgressBarOrientation value which specifies the orientation and growth direction of the bar. - + a #GtkProgressBarStyle value which specifies the visual style of the bar in percentage mode. - + The increment used for each iteration in activity mode. - + The number of blocks which can fit in the progress bar area in activity mode. - + The number of blocks which which make up progress bar when it is shown in %GTK_PROGRESS_DISCRETE style. @@ -264,7 +264,7 @@ when it is shown in %GTK_PROGRESS_DISCRETE style. - + diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml index fcf22cdc60..4445609d53 100644 --- a/docs/reference/gtk/tmpl/gtkrange.sgml +++ b/docs/reference/gtk/tmpl/gtkrange.sgml @@ -175,7 +175,7 @@ GtkRange @range: - + diff --git a/docs/reference/gtk/tmpl/gtkruler.sgml b/docs/reference/gtk/tmpl/gtkruler.sgml index 1e73d39563..679d284306 100644 --- a/docs/reference/gtk/tmpl/gtkruler.sgml +++ b/docs/reference/gtk/tmpl/gtkruler.sgml @@ -75,7 +75,7 @@ This sets the range of the ruler using gfloat lower, gfloat upper, gfloat positi - + diff --git a/docs/reference/gtk/tmpl/gtkscale.sgml b/docs/reference/gtk/tmpl/gtkscale.sgml index e34f3e25e3..877a40d09b 100644 --- a/docs/reference/gtk/tmpl/gtkscale.sgml +++ b/docs/reference/gtk/tmpl/gtkscale.sgml @@ -85,12 +85,12 @@ string. The number of decimal places that are displayed in the value. - + If the current value is displayed as a string next to the slider. - + The position in which the current value is displayed. diff --git a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml index 5a0e96b4f9..52cf2e8c1c 100644 --- a/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml +++ b/docs/reference/gtk/tmpl/gtkscrolledwindow.sgml @@ -182,17 +182,17 @@ Horizontal adjustment. See gtk_scrolled_window_set_hadjustment(), gtk_scrolled_w Vertical adjustment. See gtk_scrolled_window_set_vadjustment(), gtk_scrolled_window_get_vadjustment(). - + Horizontal scrollbar policy (show scrollbar always, never, or "when appropriate"). - + Vertical scrollbar policy (show scrollbar always, never, or "when appropriate"). - + Position of child window with respect to scrollbars; top left, top right, bottom left, bottom right. diff --git a/docs/reference/gtk/tmpl/gtkspinbutton.sgml b/docs/reference/gtk/tmpl/gtkspinbutton.sgml index 916372fbce..7b28651e4a 100644 --- a/docs/reference/gtk/tmpl/gtkspinbutton.sgml +++ b/docs/reference/gtk/tmpl/gtkspinbutton.sgml @@ -349,7 +349,7 @@ Refreshes a spin button. The behaviour of the update is determined by gtk_spin_b the #GtkAdjustment that defines a spin button's main properties. - + the amount a spin button changes when an arrow is clicked. @@ -359,7 +359,7 @@ the amount a spin button changes when an arrow is clicked. the number of decimal places to display. - + whether erroneous values are automatically changed to a spin button's nearest step increment. @@ -374,12 +374,12 @@ whether non-numeric characters should be ignored. whether a spin button should wrap upon reaching its limits. - + how a spin button should be updated. - + the type of border that surrounds the arrows of a spin button. diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml index da03752f9c..adf0c1ebd8 100644 --- a/docs/reference/gtk/tmpl/gtkstyle.sgml +++ b/docs/reference/gtk/tmpl/gtkstyle.sgml @@ -78,14 +78,11 @@ Styles @draw_polygon: @draw_arrow: @draw_diamond: -@draw_oval: @draw_string: @draw_box: @draw_flat_box: @draw_check: @draw_option: -@draw_cross: -@draw_ramp: @draw_tab: @draw_shadow_gap: @draw_box_gap: @@ -93,6 +90,8 @@ Styles @draw_focus: @draw_slider: @draw_handle: +@draw_expander: +@draw_layout: @@ -299,21 +298,6 @@ Styles @height: - - - - - -@style: -@window: -@state_type: -@shadow_type: -@x: -@y: -@width: -@height: - - @@ -375,21 +359,6 @@ Styles @height: - - - - - -@style: -@window: -@state_type: -@shadow_type: -@x: -@y: -@width: -@height: - - @@ -465,22 +434,6 @@ Styles @height: - - - - - -@style: -@window: -@state_type: -@shadow_type: -@arrow_type: -@x: -@y: -@width: -@height: - - @@ -530,6 +483,32 @@ Styles @height: + + + + + +@style: +@window: +@state_type: +@x: +@y: +@is_open: + + + + + + + +@style: +@window: +@state_type: +@x: +@y: +@layout: + + @@ -607,24 +586,6 @@ Styles @height: - - - - - -@style: -@window: -@state_type: -@shadow_type: -@area: -@widget: -@detail: -@x: -@y: -@width: -@height: - - @@ -749,24 +710,6 @@ Styles @height: - - - - - -@style: -@window: -@state_type: -@shadow_type: -@area: -@widget: -@detail: -@x: -@y: -@width: -@height: - - @@ -784,25 +727,6 @@ Styles @fill: - - - - - -@style: -@window: -@state_type: -@shadow_type: -@area: -@widget: -@detail: -@arrow_type: -@x: -@y: -@width: -@height: - - @@ -911,3 +835,35 @@ Styles @x: + + + + + +@style: +@window: +@state_type: +@area: +@widget: +@detail: +@x: +@y: +@is_open: + + + + + + + +@style: +@window: +@state_type: +@area: +@widget: +@detail: +@x: +@y: +@layout: + + diff --git a/docs/reference/gtk/tmpl/gtktable.sgml b/docs/reference/gtk/tmpl/gtktable.sgml index 74fe50b426..3ca973b37a 100644 --- a/docs/reference/gtk/tmpl/gtktable.sgml +++ b/docs/reference/gtk/tmpl/gtktable.sgml @@ -201,22 +201,22 @@ changes the homogenous property of table cells. Ie. whether all cells are an equ to FALSE if this is not your desired behaviour. - + set or retrieve the number of rows in a table. - + set or retrieve the number of columnsin a table. - + set or retrieve the number of pixels of space between each row. - + set or retrieve the number of pixels of space between each column. diff --git a/docs/reference/gtk/tmpl/gtktext.sgml b/docs/reference/gtk/tmpl/gtktext.sgml index 04a52b5f91..e71f07a83d 100644 --- a/docs/reference/gtk/tmpl/gtktext.sgml +++ b/docs/reference/gtk/tmpl/gtktext.sgml @@ -236,12 +236,12 @@ Used by the #GtkText widget to keep track of the size of it's vertical text. - + Boolean value indicating whether line wrap is enabled or not. - + Boolean value indicated whether word wrap is enabled or not. diff --git a/docs/reference/gtk/tmpl/gtktextbuffer.sgml b/docs/reference/gtk/tmpl/gtktextbuffer.sgml index c8f072322b..64ad8b4001 100644 --- a/docs/reference/gtk/tmpl/gtktextbuffer.sgml +++ b/docs/reference/gtk/tmpl/gtktextbuffer.sgml @@ -541,6 +541,22 @@ types related to the text widget and how they work together. @Returns: + + + + + +@buffer: + + + + + + + +@buffer: + + @@ -551,6 +567,13 @@ types related to the text widget and how they work together. @arg2: @arg3: + + + + + +@textbuffer: the object which received the signal. + @@ -558,7 +581,23 @@ types related to the text widget and how they work together. @textbuffer: the object which received the signal. - + + + + + +@textbuffer: the object which received the signal. +@arg1: +@arg2: + + + + + + +@textbuffer: the object which received the signal. + + @@ -566,7 +605,6 @@ types related to the text widget and how they work together. @textbuffer: the object which received the signal. @arg1: @arg2: -@arg3: @@ -577,6 +615,7 @@ types related to the text widget and how they work together. @arg1: @arg2: @arg3: + @arg4: diff --git a/docs/reference/gtk/tmpl/gtktextiter.sgml b/docs/reference/gtk/tmpl/gtktextiter.sgml index 4fd0e08ca5..522ea9fdab 100644 --- a/docs/reference/gtk/tmpl/gtktextiter.sgml +++ b/docs/reference/gtk/tmpl/gtktextiter.sgml @@ -25,6 +25,13 @@ types related to the text widget and how they work together. +@parent_instance: +@tag_table: +@btree: +@clipboard_contents: +@log_attr_cache: +@user_action_count: +@modified: @@ -251,6 +258,33 @@ types related to the text widget and how they work together. @Returns: + + + + + +@iter: +@Returns: + + + + + + + +@iter: +@Returns: + + + + + + + +@iter: +@Returns: + + @@ -269,6 +303,15 @@ types related to the text widget and how they work together. @Returns: + + + + + +@iter: +@Returns: + + @@ -278,6 +321,15 @@ types related to the text widget and how they work together. @Returns: + + + + + +@iter: +@Returns: + + @@ -288,6 +340,15 @@ types related to the text widget and how they work together. @Returns: + + + + + +@iter: +@Returns: + + @@ -306,7 +367,7 @@ types related to the text widget and how they work together. @Returns: - + @@ -315,7 +376,7 @@ types related to the text widget and how they work together. @Returns: - + @@ -420,6 +481,44 @@ types related to the text widget and how they work together. @Returns: + + + + + +@iter: +@Returns: + + + + + + + +@iter: +@Returns: + + + + + + + +@iter: +@count: +@Returns: + + + + + + + +@iter: +@count: +@Returns: + + @@ -464,7 +563,7 @@ types related to the text widget and how they work together. @iter: - + diff --git a/docs/reference/gtk/tmpl/gtktextmark.sgml b/docs/reference/gtk/tmpl/gtktextmark.sgml index d9a9964183..204b00be57 100644 --- a/docs/reference/gtk/tmpl/gtktextmark.sgml +++ b/docs/reference/gtk/tmpl/gtktextmark.sgml @@ -97,3 +97,12 @@ Marks are typically created using the gtk_text_buffer_create_mark() function. @Returns: + + + + + +@mark: +@Returns: + + diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml index 52a9945a4d..8858fd780b 100644 --- a/docs/reference/gtk/tmpl/gtktexttag.sgml +++ b/docs/reference/gtk/tmpl/gtktexttag.sgml @@ -26,6 +26,40 @@ types related to the text widget and how they work together. +@parent_instance: +@table: +@name: +@priority: +@values: +@bg_color_set: +@bg_stipple_set: +@fg_color_set: +@family_set: +@style_set: +@variant_set: +@weight_set: +@stretch_set: +@size_set: +@fg_stipple_set: +@justify_set: +@left_margin_set: +@indent_set: +@rise_set: +@strikethrough_set: +@right_margin_set: +@pixels_above_lines_set: +@pixels_below_lines_set: +@pixels_inside_wrap_set: +@tabs_set: +@underline_set: +@wrap_mode_set: +@bg_full_height_set: +@invisible_set: +@editable_set: +@language_set: +@pad1: +@pad2: +@pad3: @@ -38,6 +72,10 @@ types related to the text widget and how they work together. +@parent_instance: +@hash: +@anonymous: +@anon_count: @@ -144,6 +182,17 @@ Describes a type of line wrapping. +@src: +@Returns: + +@dest: + + + + + + + @src: @dest: @@ -186,23 +235,38 @@ when the tag is created. Background color, as a string such as "red" or "#FFFFFF" - + Background color, as a #GdkColor. - + Whether to make the background color for each character the height of the highest font used on the current line, or the height of the font used for the current character. - + A #GdkBitmap to use for stippling the background color. + + +Foreground color as a string such as "red" or "#FFFFFF". + + + + +Foreground color as a #GdkColor. + + + + +A #GdkBitmap to use as a stipple pattern for the foreground. + + The #GtkTextDirection for the tagged text. @@ -218,7 +282,7 @@ Whether the user can modify the tagged text. Font as a Pango font name, e.g. "Sans Italic 12" - + Font as a #PangoFontDescription. @@ -253,26 +317,11 @@ Font as a #PangoFontDescription. - + - - -Foreground color as a string such as "red" or "#FFFFFF". - - - - -Foreground color as a #GdkColor. - - - - -A #GdkBitmap to use as a stipple pattern for the foreground. - - A #GtkJustification for the text. This is only used when the tag is @@ -286,11 +335,16 @@ hint when rendering the text. If you don't understand this argument, you probably don't need it. - + Pixel width of left margin of the text. + + +Pixel width of right margin. + + @@ -301,27 +355,22 @@ Pixel width of left margin of the text. - + Pixels of blank space to leave above each newline-terminated line. - + Pixels of blank space to leave below each newline-terminated line. - + Pixels of blank space to leave between wrapped lines inside the same newline-terminated line (paragraph). - - -Pixel width of right margin. - - %TRUE to draw a line through the text. @@ -332,7 +381,7 @@ Pixel width of right margin. A #PangoUnderline value. - + A #GtkWrapMode value. Only used if the tag applies to the first character in a paragraph. @@ -349,142 +398,142 @@ applies to the first character in a paragraph. - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/docs/reference/gtk/tmpl/gtktextview.sgml b/docs/reference/gtk/tmpl/gtktextview.sgml index 808e424b4a..d2621b8ed8 100644 --- a/docs/reference/gtk/tmpl/gtktextview.sgml +++ b/docs/reference/gtk/tmpl/gtktextview.sgml @@ -81,7 +81,22 @@ types related to the text widget and how they work together. @text_view: @mark: +@within_margin: +@use_align: +@xalign: +@yalign: +@Returns: + @mark_within_margin: + + + + + + + +@text_view: +@mark: @Returns: @@ -113,60 +128,6 @@ types related to the text widget and how they work together. @visible_rect: - - - - - -@text_view: -@wrap_mode: - - - - - - - -@text_view: -@Returns: - - - - - - - -@text_view: -@setting: - - - - - - - -@text_view: -@Returns: - - - - - - - -@text_view: -@setting: - - - - - - - -@text_view: -@Returns: - - @@ -276,6 +237,67 @@ types related to the text widget and how they work together. @height: + + + + + +@text_view: +@iter: +@Returns: + + + + + + + +@text_view: +@iter: +@Returns: + + + + + + + +@text_view: +@iter: +@Returns: + + + + + + + +@text_view: +@iter: +@Returns: + + + + + + + +@text_view: +@iter: +@Returns: + + + + + + + +@text_view: +@iter: +@count: +@Returns: + + @@ -309,6 +331,204 @@ types related to the text widget and how they work together. @ypos: + + + + + +@text_view: +@wrap_mode: + + + + + + + +@text_view: +@Returns: + + + + + + + +@text_view: +@setting: + + + + + + + +@text_view: +@Returns: + + + + + + + +@text_view: +@setting: + + + + + + + +@text_view: +@Returns: + + + + + + + +@text_view: +@pixels_above_lines: + + + + + + + +@text_view: +@Returns: + + + + + + + +@text_view: +@pixels_below_lines: + + + + + + + +@text_view: +@Returns: + + + + + + + +@text_view: +@pixels_inside_wrap: + + + + + + + +@text_view: +@Returns: + + + + + + + +@text_view: +@justification: + + + + + + + +@text_view: +@Returns: + + + + + + + +@text_view: +@left_margin: + + + + + + + +@text_view: +@Returns: + + + + + + + +@text_view: +@right_margin: + + + + + + + +@text_view: +@Returns: + + + + + + + +@text_view: +@indent: + + + + + + + +@text_view: +@Returns: + + + + + + + +@text_view: +@tabs: + + + + + + + +@text_view: +@Returns: + + @@ -380,27 +600,27 @@ types related to the text widget and how they work together. @textview: the object which received the signal. - + - + - + - + - + @@ -410,7 +630,7 @@ types related to the text widget and how they work together. - + @@ -420,12 +640,12 @@ types related to the text widget and how they work together. - + - + diff --git a/docs/reference/gtk/tmpl/gtktipsquery.sgml b/docs/reference/gtk/tmpl/gtktipsquery.sgml index 820526f24c..eb2467af9f 100644 --- a/docs/reference/gtk/tmpl/gtktipsquery.sgml +++ b/docs/reference/gtk/tmpl/gtktipsquery.sgml @@ -188,7 +188,7 @@ Emitted when a widget is selected during a query. @event: the button press or button release event. @Returns: TRUE if the query should be stopped. - + TRUE if the widget-entered and widget-selected signals are emitted even when the widget has no tooltip set. @@ -201,13 +201,13 @@ If it is selected while the query is in effect the query is automatically stopped. - + The text to display in the #GtkTipsQuery widget when the query is not in effect. - + The text to display in the #GtkTipsQuery widget when the query is running and the widget that the pointer is over has no tooltip. diff --git a/docs/reference/gtk/tmpl/gtktogglebutton.sgml b/docs/reference/gtk/tmpl/gtktogglebutton.sgml index 65f98af296..5a7fe1cf8e 100644 --- a/docs/reference/gtk/tmpl/gtktogglebutton.sgml +++ b/docs/reference/gtk/tmpl/gtktogglebutton.sgml @@ -156,7 +156,7 @@ Should be connected if you wish to perform an action whenever the Sets whether the toggle button should be pressed in or not. - + A value of TRUE causes the toggle button to be invisible. FALSE displays it again. diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml index 3fe21b8217..921154df51 100644 --- a/docs/reference/gtk/tmpl/gtktoolbar.sgml +++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml @@ -324,17 +324,17 @@ should be used if you wish to perform an action when ever the style of a toolbar - + - + - + diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml index 52a372fc36..f188e9b48a 100644 --- a/docs/reference/gtk/tmpl/gtktreemodel.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml @@ -28,9 +28,9 @@ gtktreemodel @stamp: -@tree_node: -@tree_node2: -@tree_node3: +@user_data: +@user_data2: +@user_data3: @@ -54,6 +54,7 @@ gtktreemodel @inserted: @child_toggled: @deleted: +@reordered: @get_flags: @get_n_columns: @get_column_type: diff --git a/docs/reference/gtk/tmpl/gtkmodelsimple.sgml b/docs/reference/gtk/tmpl/gtktreemodelsimple.sgml similarity index 57% rename from docs/reference/gtk/tmpl/gtkmodelsimple.sgml rename to docs/reference/gtk/tmpl/gtktreemodelsimple.sgml index 85479fed2b..a3ae2da106 100644 --- a/docs/reference/gtk/tmpl/gtkmodelsimple.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodelsimple.sgml @@ -14,7 +14,7 @@ GtkModelSimple - + @@ -22,7 +22,7 @@ GtkModelSimple @parent: @stamp: - + @@ -30,7 +30,7 @@ GtkModelSimple @Returns: - + @@ -40,7 +40,7 @@ GtkModelSimple @iter: - + @@ -50,7 +50,7 @@ GtkModelSimple @iter: - + @@ -60,7 +60,7 @@ GtkModelSimple @iter: - + diff --git a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml index 6eddb40c1f..9fa7048ef3 100644 --- a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml @@ -44,10 +44,12 @@ GtkTreeModelSort -@model: +@child_model: @func: @sort_col: @Returns: + +@model: @@ -56,10 +58,12 @@ GtkTreeModelSort @tree_model_sort: +@child_model: + @model: - + @@ -77,21 +81,25 @@ GtkTreeModelSort @func: - - - - - -@tree_model_sort: - - @tree_model_sort: -@path: +@child_path: @Returns: + +@path: + + + + + + + +@tree_model_sort: +@sort_iter: +@child_iter: diff --git a/docs/reference/gtk/tmpl/gtktreeselection.sgml b/docs/reference/gtk/tmpl/gtktreeselection.sgml index 21408a18b6..eb6d2695c2 100644 --- a/docs/reference/gtk/tmpl/gtktreeselection.sgml +++ b/docs/reference/gtk/tmpl/gtktreeselection.sgml @@ -14,7 +14,7 @@ GtkTreeSelection - + @@ -44,15 +44,7 @@ GtkTreeSelection @data: - - - - - -@Returns: - - - + @@ -80,6 +72,15 @@ GtkTreeSelection @Returns: + + + + + +@selection: +@Returns: + + @@ -163,21 +164,3 @@ GtkTreeSelection @end_path: - - - - - -@tree_view: -@Returns: - - - - - - - -@selection: -@tree_view: - - diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml index bff0f90aa0..92e290fc4c 100644 --- a/docs/reference/gtk/tmpl/gtktreeview.sgml +++ b/docs/reference/gtk/tmpl/gtktreeview.sgml @@ -28,10 +28,6 @@ GtkTreeView @parent: -@tree_view: -@type: -@user_func: -@user_data: @@ -155,7 +151,7 @@ GtkTreeView @tree_view: - + diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml index 67a0f6280c..b266434db4 100644 --- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml +++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml @@ -32,7 +32,7 @@ GtkTreeViewColumn @window: @justification: @id: -@size: +@width: @min_width: @max_width: @func: @@ -45,7 +45,7 @@ GtkTreeViewColumn @button_active: @dirty: - + @@ -141,7 +141,7 @@ GtkTreeViewColumn @Returns: - + @@ -168,15 +168,13 @@ GtkTreeViewColumn @Returns: - + @tree_column: @size: - -@width: @@ -233,7 +231,7 @@ GtkTreeViewColumn @Returns: - + @@ -278,3 +276,11 @@ GtkTreeViewColumn @Returns: + + + + + +@tree_column: + + diff --git a/docs/reference/gtk/tmpl/gtkviewport.sgml b/docs/reference/gtk/tmpl/gtkviewport.sgml index 473d501662..a976868104 100644 --- a/docs/reference/gtk/tmpl/gtkviewport.sgml +++ b/docs/reference/gtk/tmpl/gtkviewport.sgml @@ -94,7 +94,7 @@ GtkViewport - + diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index 5b05c5e574..2790ec369f 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -310,20 +310,11 @@ GtkWidget @type: -@first_arg_name: +@first_property_name: @Varargs: @Returns: - - - - - - - -@type: -@nargs: -@args: -@Returns: + +@first_arg_name: @@ -360,43 +351,16 @@ GtkWidget @widget_pointer: - - - - - -@widget: -@arg: - - - - - - - -@widget: -@nargs: -@args: - - @widget: -@first_arg_name: +@first_property_name: @Varargs: - - - - - - - -@widget: -@nargs: -@args: + +@first_arg_name: @@ -642,6 +606,15 @@ GtkWidget @Returns: + + + + + +@widget: +@Returns: + + @@ -1453,14 +1426,6 @@ GtkWidget @time: @Returns: - - - - - -@widget: the object which received the signal. -@area: - @@ -1813,37 +1778,37 @@ GtkWidget - + - + - + - + - + - + - + @@ -1858,7 +1823,7 @@ GtkWidget - + diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml index b46bcd7b8a..0793f19c8a 100644 --- a/docs/reference/gtk/tmpl/gtkwindow.sgml +++ b/docs/reference/gtk/tmpl/gtkwindow.sgml @@ -263,17 +263,17 @@ The type of the window. The title of the window. - + If the window shrinks automatically when widgets within it shrink. - + If the window can be resized to a smaller size by the user. - + If the window can be resized to a larger size by the user. @@ -283,22 +283,22 @@ If the window can be resized to a larger size by the user. If the window is modal, i.e. it grabs all GTK+ events. - + The position of the window. - + - + - +