From 9c3c1cd3b514ec9f5aef5b7b19f7acf7a5ccdaea Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 21 Jun 2001 17:44:27 +0000 Subject: [PATCH] Update a bit. Thu Jun 21 12:31:29 2001 Owen Taylor * gtk/gtk-sections.txt: Update a bit. * Makefile.am: build GTK+ docs. --- docs/reference/ChangeLog | 6 + docs/reference/Makefile.am | 2 +- docs/reference/gtk/gtk-sections.txt | 37 -- docs/reference/gtk/gtk.types | 1 - docs/reference/gtk/tmpl/gtk-unused.sgml | 388 ++++++++++++++++++ docs/reference/gtk/tmpl/gtkarg.sgml | 186 --------- docs/reference/gtk/tmpl/gtkclist.sgml | 12 +- docs/reference/gtk/tmpl/gtkcontainer.sgml | 120 +----- docs/reference/gtk/tmpl/gtkfilesel.sgml | 10 +- docs/reference/gtk/tmpl/gtknotebook.sgml | 40 +- docs/reference/gtk/tmpl/gtkpacker.sgml | 38 +- docs/reference/gtk/tmpl/gtkprogressbar.sgml | 34 +- docs/reference/gtk/tmpl/gtkrc.sgml | 35 -- docs/reference/gtk/tmpl/gtktable.sgml | 10 +- docs/reference/gtk/tmpl/gtktexttag.sgml | 200 ++++----- docs/reference/gtk/tmpl/gtktreemodelsort.sgml | 4 +- docs/reference/gtk/tmpl/gtkwidget.sgml | 8 + docs/reference/gtk/tmpl/gtkwindow.sgml | 1 + 18 files changed, 572 insertions(+), 560 deletions(-) diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 2bc011643c..6ddd476989 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 21 12:31:29 2001 Owen Taylor + + * gtk/gtk-sections.txt: Update a bit. + + * Makefile.am: build GTK+ docs. + Fri Jun 8 12:33:29 2001 Jonathan Blandford * gtk/tmpl/gtktable.sgml: fix bug #55921 diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 1ce203f973..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/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index b5bf9399c3..a6e323e590 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -448,19 +448,9 @@ gtk_container_set_focus_vadjustment gtk_container_set_focus_hadjustment gtk_container_resize_children gtk_container_child_type -gtk_container_add_child_arg_type -gtk_container_query_child_args -gtk_container_child_getv -gtk_container_child_setv -gtk_container_add_with_args -gtk_container_addv gtk_container_child_set gtk_container_queue_resize gtk_container_clear_resize_widgets -gtk_container_arg_set -gtk_container_arg_get -gtk_container_child_args_collect -gtk_container_child_arg_get_info gtk_container_forall gtk_container_child_composite_name gtk_container_set_border_width @@ -1517,7 +1507,6 @@ GTK_IS_OBJECT_CLASS GTK_OBJECT_GET_CLASS -GTK_ARG_MASK GTK_ARG_READWRITE @@ -3408,7 +3397,6 @@ gtk_theme_engine_get_type GtkRcStyle GtkRcStyleClass GtkRcFlags -GtkImageLoader GtkRcTokenType gtk_rc_scanner_new gtk_rc_get_style @@ -3430,8 +3418,6 @@ gtk_rc_get_module_dir gtk_rc_get_im_module_path gtk_rc_get_im_module_file gtk_rc_get_theme_dir -gtk_rc_set_image_loader -gtk_rc_load_image gtk_rc_style_new gtk_rc_style_copy gtk_rc_style_ref @@ -3445,9 +3431,6 @@ gtk_rc_style_get_type GTK_RC_STYLE_CLASS GTK_IS_RC_STYLE_CLASS GTK_RC_STYLE_GET_CLASS - - -gtk_rc_init
@@ -3607,26 +3590,6 @@ gtk_signal_default_marshaller gtk_signal_compat_matched
-
-gtkarg -Object Properties -GtkArgInfo -gtk_arg_new -gtk_arg_copy -gtk_arg_free -gtk_arg_reset -gtk_arg_values_equal -gtk_args_collect -gtk_args_collect_cleanup -gtk_arg_get_info -gtk_arg_type_new_static -gtk_args_query -gtk_arg_name_strip_type -gtk_arg_info_equal -gtk_arg_info_hash -gtk_arg_to_valueloc -
-
gtktypeutils Types diff --git a/docs/reference/gtk/gtk.types b/docs/reference/gtk/gtk.types index a3d7a8f628..e13ae7b72c 100644 --- a/docs/reference/gtk/gtk.types +++ b/docs/reference/gtk/gtk.types @@ -58,7 +58,6 @@ gtk_notebook_get_type gtk_old_editable_get_type gtk_object_get_type gtk_option_menu_get_type -gtk_packer_get_type gtk_paned_get_type gtk_pixmap_get_type gtk_plug_get_type diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index ae135db43f..5e03313b25 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -1,3 +1,50 @@ + + +All the functions in here are marked a Non-public. +We describe it anyway because it is occasionally useful +to understand how the work is done. + + +Arguments are a way of describing a named parameter to a function. +They have two important roles within gtk+: + + + +they describe object properties. +This means that they present an interface to get and set a named-type +for any type of object in a consistent way. +(All the relevant functions to do this start with gtk_object_set +or gtk_object_get). + + + + +they describe signal arguments. +This is a lot less often needed but still useful. +Usually if you are just emitting or creating a particular signal +it is more convenient to just use gtk_signal_emit() or gtk_signal_new(). +However if you are writing a function to emit or create an arbitrary +signal, you must use gtk_signal_emitv() or gtk_signal_newv(). + + + + + + + + +#GtkObject. + + + + +Utility function to manipulate lists of named, typed arguments. + + + +Implementation of Object Properties + + The #GtkData object is a very simple object intended to be used as a base @@ -352,6 +399,23 @@ Define a function pointer. Deprecated. @arg: @arg_id: + + +A structure containing information about the argument. +Returned by gtk_arg_get_info(). + + +@class_type: if the argument is an object, this is the object class type. +@name: the name of the argument. +@type: the type of the argument; it may be an object's type +or a fundamental type. +@arg_flags: flags applicable to the argument (i.e. readable, writable, +and whether it needs to be constructed). +@full_name: the object name and argument name separated by ::, +e.g. "GtkObject::user_data" or "GtkButton::label". +@arg_id: the unique argument identified. +@seq_id: ??? + Define a function pointer. Deprecated. @@ -638,6 +702,19 @@ the #GtkAdjustment which sets the range of the scale. @tentative_match: @tentative_match_len: + + +A GtkImageLoader is used to load a filename found in +a RC file. + + +@window: the window for creating image +@colormap: the colormap for this image +@mask: a pointer to the location to store the mask +@transparent_color: the transparent color for the image +@filename: filename to load +@Returns: a #GtkPixmap representing @filename + @@ -685,6 +762,42 @@ after other user handlers and the default handler. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -867,6 +980,161 @@ the #GtkAdjustment which sets the range of the scale. @widget: the object which received the signal. + + +It will either copy data into an existing argument or allocate a new argument +and copy the data. Strings are duplicated. All other pointers and +values are copied (shallowly-- that is the pointers themselves are +copied, not the data they point to.) + + +You should call gtk_arg_reset() on dest_arg before calling this +if the argument may contain string data that you want freed. + + +@src_arg: the argument to duplicate. +@dest_arg: the argument to copy over (or NULL to create a new #GtkArg). +@Returns: the new #GtkArg (or dest_arg, if it was not NULL). + + + +Frees the argument, and optionally its contents. + + +@arg: the argument to free. +@free_contents: whether to free the string, if it is a string. + + + +Private: get information about an argument. + + +@object_type: the type of object. +@arg_info_hash_table: the hashtable of #GtkArgInfos. +@arg_name: the name of the argument to lookup. +@info_p: the argument info. +@Returns: an error message on failure, or NULL otherwise. + + + +A #GCompareFunc for hashing #GtkArgInfos. + + +@arg_info_1: a #GtkArgInfo. +@arg_info_2: a #GtkArgInfo. +@Returns: whether the arguments are the same. + + + +A #GHashFunc for hashing #GtkArgInfos. + + +@arg_info: a #GtkArgInfo. +@Returns: a hash value for that #GtkArgInfo. + + + +Given a fully qualified argument name (e.g. "GtkButton::label") +it returns just the argument name (e.g. "label") unless +the argument name was invalid, in which case it returns NULL. + + +@arg_name: the fully-qualified argument name. +@Returns: the base argument name. + + + +Creates a new argument of a certain type, set to 0 or NULL. + + +@arg_type: the type of the argument. +@Returns: the newly created #GtkArg. + + + + + + +@arg: + + + + + + +@arg: +@value_pointer: + + + +Create a new argument registered with a class. + + +@base_class_type: the basic type having the arguments, almost alway +GTK_TYPE_OBJECT, except if your defining a different type argument +that gets a different namespace. #GtkContainer does this to define +per-child arguments of the container. +@arg_name: name of the argument to create. (must be a static constant string) +@class_n_args_offset: offset into the base class structure that tells +the number of arguments. +@arg_info_hash_table: hashtable of #GtkArgInfos. +@arg_type: type of the argument. +@arg_flags: flags of the argument. +@arg_id: ??? +@Returns: the new #GtkArgInfo. + + + + + + +@arg1: +@arg2: +@Returns: + + + +Private: given a hashtable of argument information it takes a vararg +list and parses it into arguments (in the form of lists of #GtkArgs +and lists of #GtkArgInfos. + + +The list of arguments starts with first_arg_name then the first argument's +value. Followed by any number of additional name/argument pairs, +terminated with NULL. + + +@object_type: the type of object we are collecting arguments for. +@arg_info_hash_table: a hashtable mapping from names of arguments +to their #GtkArgInfos. +@arg_list_p: a returned list of arguments obtained from parsing the +varargs. +@info_list_p: a returned list of the #GtkArgInfos. +@first_arg_name: the name of the first argument. +@var_args: a va_list containing the value of the first argument, +followed by name/value pairs, followed by NULL. +@Returns: an error message on failure, or NULL otherwise. + + + +Private: erase lists of arguments returned from gtk_args_collect(). + + +@arg_list: arg_list_p returned from gtk_args_collect(). +@info_list: info_list_p returned from gtk_args_collect(). + + + +Private: from a class type and its arginfo hashtable, +get an array of #GtkArgs that this object accepts. + + +@class_type: the class type. +@arg_info_hash_table: the hashtable of #GtkArgInfos. +@arg_flags: returned array of argument flags. +@n_args_p: the number of arguments this object accepts. +@Returns: the array of arguments (or NULL on error). + This is an internally used function and should never be called from an @@ -1005,6 +1273,98 @@ is enabled. @colorsel: @use_palette: + + + + + +@arg_name: +@arg_type: +@arg_flags: +@arg_id: + + + + + + +@container: +@widget: +@first_arg_name: +@Varargs: + + + + + + +@container: +@widget: +@n_args: +@args: + + + + + + +@container: +@child: +@arg: +@info: + + + + + + +@container: +@child: +@arg: +@info: + + + + + + +@object_type: +@arg_name: +@info_p: +@Returns: + + + + + + +@object_type: +@arg_list_p: +@info_list_p: +@first_arg_name: +@args: +@Returns: + + + + + + +@container: +@child: +@n_args: +@args: + + + + + + +@container: +@child: +@n_args: +@args: + @@ -1014,6 +1374,16 @@ is enabled. @direction: @Returns: + + + + + +@class_type: +@arg_flags: +@nargs: +@Returns: + This function is not usually used by users. @@ -1392,6 +1762,24 @@ Internal function. + + +Internal function. Loads an image using the current +image loader. + + +@colormap: the colormap to use for the image +@transparent_color: the transparent color for the image +@filename: the filename of the image file +@Returns: a #GtkPixmap representing @filename + + + +Sets the function that GTK+ will use to load images + + +@loader: the #GtkImageLoader to use + diff --git a/docs/reference/gtk/tmpl/gtkarg.sgml b/docs/reference/gtk/tmpl/gtkarg.sgml index a268fd8050..7c2d950613 100644 --- a/docs/reference/gtk/tmpl/gtkarg.sgml +++ b/docs/reference/gtk/tmpl/gtkarg.sgml @@ -41,189 +41,3 @@ signal, you must use gtk_signal_emitv() or gtk_signal_newv(). #GtkObject. - - -A structure containing information about the argument. -Returned by gtk_arg_get_info(). - - -@class_type: if the argument is an object, this is the object class type. -@name: the name of the argument. -@type: the type of the argument; it may be an object's type -or a fundamental type. -@arg_flags: flags applicable to the argument (i.e. readable, writable, -and whether it needs to be constructed). -@full_name: the object name and argument name separated by ::, -e.g. "GtkObject::user_data" or "GtkButton::label". -@arg_id: the unique argument identified. -@seq_id: ??? - - - -Creates a new argument of a certain type, set to 0 or NULL. - - -@arg_type: the type of the argument. -@Returns: the newly created #GtkArg. - - - - -It will either copy data into an existing argument or allocate a new argument -and copy the data. Strings are duplicated. All other pointers and -values are copied (shallowly-- that is the pointers themselves are -copied, not the data they point to.) - - -You should call gtk_arg_reset() on dest_arg before calling this -if the argument may contain string data that you want freed. - - -@src_arg: the argument to duplicate. -@dest_arg: the argument to copy over (or NULL to create a new #GtkArg). -@Returns: the new #GtkArg (or dest_arg, if it was not NULL). - - - - -Frees the argument, and optionally its contents. - - -@arg: the argument to free. -@free_contents: whether to free the string, if it is a string. - - - - - - - -@arg: - - - - - - - -@arg1: -@arg2: -@Returns: - - - - -Private: given a hashtable of argument information it takes a vararg -list and parses it into arguments (in the form of lists of #GtkArgs -and lists of #GtkArgInfos. - - -The list of arguments starts with first_arg_name then the first argument's -value. Followed by any number of additional name/argument pairs, -terminated with NULL. - - -@object_type: the type of object we are collecting arguments for. -@arg_info_hash_table: a hashtable mapping from names of arguments -to their #GtkArgInfos. -@arg_list_p: a returned list of arguments obtained from parsing the -varargs. -@info_list_p: a returned list of the #GtkArgInfos. -@first_arg_name: the name of the first argument. -@var_args: a va_list containing the value of the first argument, -followed by name/value pairs, followed by NULL. -@Returns: an error message on failure, or NULL otherwise. - - - - -Private: erase lists of arguments returned from gtk_args_collect(). - - -@arg_list: arg_list_p returned from gtk_args_collect(). -@info_list: info_list_p returned from gtk_args_collect(). - - - - -Private: get information about an argument. - - -@object_type: the type of object. -@arg_info_hash_table: the hashtable of #GtkArgInfos. -@arg_name: the name of the argument to lookup. -@info_p: the argument info. -@Returns: an error message on failure, or NULL otherwise. - - - - -Create a new argument registered with a class. - - -@base_class_type: the basic type having the arguments, almost alway -GTK_TYPE_OBJECT, except if your defining a different type argument -that gets a different namespace. #GtkContainer does this to define -per-child arguments of the container. -@arg_name: name of the argument to create. (must be a static constant string) -@class_n_args_offset: offset into the base class structure that tells -the number of arguments. -@arg_info_hash_table: hashtable of #GtkArgInfos. -@arg_type: type of the argument. -@arg_flags: flags of the argument. -@arg_id: ??? -@Returns: the new #GtkArgInfo. - - - - -Private: from a class type and its arginfo hashtable, -get an array of #GtkArgs that this object accepts. - - -@class_type: the class type. -@arg_info_hash_table: the hashtable of #GtkArgInfos. -@arg_flags: returned array of argument flags. -@n_args_p: the number of arguments this object accepts. -@Returns: the array of arguments (or NULL on error). - - - - -Given a fully qualified argument name (e.g. "GtkButton::label") -it returns just the argument name (e.g. "label") unless -the argument name was invalid, in which case it returns NULL. - - -@arg_name: the fully-qualified argument name. -@Returns: the base argument name. - - - - -A #GCompareFunc for hashing #GtkArgInfos. - - -@arg_info_1: a #GtkArgInfo. -@arg_info_2: a #GtkArgInfo. -@Returns: whether the arguments are the same. - - - - -A #GHashFunc for hashing #GtkArgInfos. - - -@arg_info: a #GtkArgInfo. -@Returns: a hash value for that #GtkArgInfo. - - - - - - - -@arg: -@value_pointer: - - diff --git a/docs/reference/gtk/tmpl/gtkclist.sgml b/docs/reference/gtk/tmpl/gtkclist.sgml index 7e3d2d15c3..8d80576b8b 100644 --- a/docs/reference/gtk/tmpl/gtkclist.sgml +++ b/docs/reference/gtk/tmpl/gtkclist.sgml @@ -1279,18 +1279,18 @@ Sets the type of selection mode for the CList. An integer value representing the height of a row in pixels. - - -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 determining if the user can re-order the CList's +columns. + + A boolean value for setting whether to use icons during drag diff --git a/docs/reference/gtk/tmpl/gtkcontainer.sgml b/docs/reference/gtk/tmpl/gtkcontainer.sgml index 4632a7f11b..2cecd0a390 100644 --- a/docs/reference/gtk/tmpl/gtkcontainer.sgml +++ b/docs/reference/gtk/tmpl/gtkcontainer.sgml @@ -154,72 +154,6 @@ GtkContainer @Returns: - - - - - -@arg_name: -@arg_type: -@arg_flags: -@arg_id: - - - - - - - -@class_type: -@arg_flags: -@nargs: -@Returns: - - - - - - - -@container: -@child: -@n_args: -@args: - - - - - - - -@container: -@child: -@n_args: -@args: - - - - - - - -@container: -@widget: -@first_arg_name: -@Varargs: - - - - - - - -@container: -@widget: -@n_args: -@args: - - @@ -227,8 +161,10 @@ GtkContainer @container: @child: -@first_arg_name: +@first_prop_name: @Varargs: + +@first_arg_name: @@ -247,52 +183,6 @@ GtkContainer @container: - - - - - -@container: -@child: -@arg: -@info: - - - - - - - -@container: -@child: -@arg: -@info: - - - - - - - -@object_type: -@arg_list_p: -@info_list_p: -@first_arg_name: -@args: -@Returns: - - - - - - - -@object_type: -@arg_name: -@info_p: -@Returns: - - @@ -388,12 +278,12 @@ GtkContainer @container: the object which received the signal. @widget: - + - + diff --git a/docs/reference/gtk/tmpl/gtkfilesel.sgml b/docs/reference/gtk/tmpl/gtkfilesel.sgml index 5c7a2ef8c9..055d523224 100644 --- a/docs/reference/gtk/tmpl/gtkfilesel.sgml +++ b/docs/reference/gtk/tmpl/gtkfilesel.sgml @@ -169,13 +169,13 @@ Hides the file operation buttons that normally appear at the top of the dialog. @filesel: a #GtkFileSelection. - - - - - + + + + + diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml index 9ff69802b9..338d8259d4 100644 --- a/docs/reference/gtk/tmpl/gtknotebook.sgml +++ b/docs/reference/gtk/tmpl/gtknotebook.sgml @@ -361,31 +361,11 @@ Emitted when the user or a function changes the current page. @page: the new current page @page_num: the index of the 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. @@ -402,6 +382,26 @@ Whether the tab label area will have arrows for scrolling if there are too many tabs to fit in the area. + + +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. + + + + +The current page + + Whether the popup menu for switching pages is enabled. diff --git a/docs/reference/gtk/tmpl/gtkpacker.sgml b/docs/reference/gtk/tmpl/gtkpacker.sgml index c2bdafecc5..eb8f8f70f5 100644 --- a/docs/reference/gtk/tmpl/gtkpacker.sgml +++ b/docs/reference/gtk/tmpl/gtkpacker.sgml @@ -19,6 +19,14 @@ GtkPacker +@parent: +@children: +@spacing: +@default_border_width: +@default_pad_x: +@default_pad_y: +@default_i_pad_x: +@default_i_pad_y: @@ -187,33 +195,3 @@ GtkPacker @i_pad_y: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/reference/gtk/tmpl/gtkprogressbar.sgml b/docs/reference/gtk/tmpl/gtkprogressbar.sgml index 3943f02aa9..317902b93e 100644 --- a/docs/reference/gtk/tmpl/gtkprogressbar.sgml +++ b/docs/reference/gtk/tmpl/gtkprogressbar.sgml @@ -261,9 +261,14 @@ gtk_progress_set_percentage() instead. @percentage: the new percent complete value. - + -a #GtkAdjustment to be used with the #GtkProgressBar. + + + + + + @@ -272,6 +277,16 @@ a #GtkProgressBarOrientation value which specifies the orientation and growth direction of the bar. + + + + + + + +a #GtkAdjustment to be used with the #GtkProgressBar. + + a #GtkProgressBarStyle value which specifies the @@ -295,18 +310,3 @@ The number of blocks which which make up progress bar when it is shown in %GTK_PROGRESS_DISCRETE style. - - - - - - - - - - - - - - - diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml index 244dd09a1b..5f8876c8fe 100644 --- a/docs/reference/gtk/tmpl/gtkrc.sgml +++ b/docs/reference/gtk/tmpl/gtkrc.sgml @@ -495,7 +495,6 @@ This can later be composited together with other #GtkRcStyle structures to form a #GtkStyle. -@parent_instance: @name: @bg_pixmap_name: @font_desc: @@ -555,20 +554,6 @@ set for each state. @GTK_RC_TEXT: @GTK_RC_BASE: - - -A GtkImageLoader is used to load a filename found in -a RC file. - - -@window: the window for creating image -@colormap: the colormap for this image -@mask: a pointer to the location to store the mask -@transparent_color: the transparent color for the image -@filename: filename to load -@Returns: a #GtkPixmap representing @filename - - The #GtkRcTokenType enumeration represents the tokens @@ -835,26 +820,6 @@ itself.) @Returns: The directory. (Must be freed with g_free()) - - -Sets the function that GTK+ will use to load images - - -@loader: the #GtkImageLoader to use - - - - -Internal function. Loads an image using the current -image loader. - - -@colormap: the colormap to use for the image -@transparent_color: the transparent color for the image -@filename: the filename of the image file -@Returns: a #GtkPixmap representing @filename - - Create a new #GtkRcStyle with no fields set and diff --git a/docs/reference/gtk/tmpl/gtktable.sgml b/docs/reference/gtk/tmpl/gtktable.sgml index 59242d40b7..1251f63450 100644 --- a/docs/reference/gtk/tmpl/gtktable.sgml +++ b/docs/reference/gtk/tmpl/gtktable.sgml @@ -214,16 +214,16 @@ 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. + + +set or retrieve the number of pixels of space between each row. + + whether each cell in the table should be the same size or not. diff --git a/docs/reference/gtk/tmpl/gtktexttag.sgml b/docs/reference/gtk/tmpl/gtktexttag.sgml index 7cff611ab8..12b6de795f 100644 --- a/docs/reference/gtk/tmpl/gtktexttag.sgml +++ b/docs/reference/gtk/tmpl/gtktexttag.sgml @@ -198,48 +198,31 @@ 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". + + +Background color, as a #GdkColor. + + Foreground color as a #GdkColor. + + +A #GdkBitmap to use for stippling the background color. + + A #GdkBitmap to use as a stipple pattern for the foreground. - - -The #GtkTextDirection for the tagged text. - - - - -Whether the user can modify the tagged text. - - Font as a Pango font name, e.g. "Sans Italic 12" @@ -280,44 +263,12 @@ Font as a #PangoFontDescription. - - - - - - - - - - - - -The language this text is in, as an ISO code. Pango can use this as a -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. - - - - - - - - + @@ -338,20 +289,69 @@ Pixels of blank space to leave between wrapped lines inside the same newline-terminated line (paragraph). + + +Whether the user can modify the tagged text. + + + + +A #GtkWrapMode value. Only used if the tag applies to the first +character in a paragraph. + + + + + + + + + +The #GtkTextDirection for the tagged text. + + + + +Pixel width of left margin of the text. + + + + + + + %TRUE to draw a line through the text. + + +Pixel width of right margin. + + A #PangoUnderline value. - + -A #GtkWrapMode value. Only used if the tag applies to the first -character in a paragraph. + + + + + +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. + + + + +The language this text is in, as an ISO code. Pango can use this as a +hint when rendering the text. If you don't understand this argument, +you probably don't need it. @@ -370,7 +370,7 @@ applies to the first character in a paragraph. - + @@ -380,21 +380,11 @@ applies to the first character in a paragraph. - - - - - - - - - - @@ -430,31 +420,6 @@ applies to the first character in a paragraph. - - - - - - - - - - - - - - - - - - - - - - - - - @@ -470,6 +435,31 @@ applies to the first character in a paragraph. + + + + + + + + + + + + + + + + + + + + + + + + + @@ -485,7 +475,17 @@ applies to the first character in a paragraph. - + + + + + + + + + + + diff --git a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml index 68c71cd16f..20dbfc5717 100644 --- a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml @@ -45,10 +45,10 @@ GtkTreeModelSort @child_model: -@func: -@sort_col: @Returns: +@func: +@sort_col: @model: diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml index b581073286..ab9a355599 100644 --- a/docs/reference/gtk/tmpl/gtkwidget.sgml +++ b/docs/reference/gtk/tmpl/gtkwidget.sgml @@ -1378,6 +1378,14 @@ GtkWidget @event: @Returns: + + + + + +@widget: the object which received the signal. +@arg1: + diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml index 6f4ab3766a..2f34d9feb6 100644 --- a/docs/reference/gtk/tmpl/gtkwindow.sgml +++ b/docs/reference/gtk/tmpl/gtkwindow.sgml @@ -411,6 +411,7 @@ it's larger @window: +@setting: