From c26e3eeebc1a9bd9e8b3a5a10f4e29383589fb4d Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 9 Jan 2001 16:41:17 +0000 Subject: 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/gtk/tmpl/gtk-unused.sgml | 671 +++++++++++++++++++-- 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 +- docs/reference/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/gtkmodelsimple.sgml | 72 --- 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 +- docs/reference/gtk/tmpl/gtkscrolledwindow.sgml | 6 +- docs/reference/gtk/tmpl/gtkspinbutton.sgml | 8 +- docs/reference/gtk/tmpl/gtkstyle.sgml | 140 ++--- 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 | 334 ++++++++-- 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 +- docs/reference/gtk/tmpl/gtktreemodelsimple.sgml | 72 +++ docs/reference/gtk/tmpl/gtktreemodelsort.sgml | 20 +- docs/reference/gtk/tmpl/gtktreeselection.sgml | 37 +- docs/reference/gtk/tmpl/gtktreeview.sgml | 6 +- docs/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 +- 50 files changed, 1558 insertions(+), 866 deletions(-) delete mode 100644 docs/reference/gtk/tmpl/gtkmodelsimple.sgml create mode 100644 docs/reference/gtk/tmpl/gtktreemodelsimple.sgml (limited to 'docs/reference/gtk/tmpl') diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 0f3279409..28e71fdec 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,20 +302,20 @@ A structure used to return values from @gtk_type_query. @object_size: @class_size: - + -@buffer: -@Returns: +@v: - + -@v: +@buffer: +@Returns: @@ -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 7676b5c70..07710fe4d 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 dd3eaf25b..fc40e3dcc 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 bac6976d5..4f01f1aed 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 b94a57489..cafd4fb01 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 96dc1bb05..ae99e4d4a 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 76cdb5b4f..ae1485a7d 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 dfcf2a992..ec674dea8 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 88f4e8650..c9716105f 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 2c3b78e01..919f6295f 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 6c95fceab..7e5111e1d 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 33beb4c95..162f9300b 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 0547a0ee1..077699e7d 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 f4f15b7ce..c5a38131d 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 eb528cfea..4eaf3e468 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 b4e8506f8..1c7a5e215 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/gtkmodelsimple.sgml b/docs/reference/gtk/tmpl/gtkmodelsimple.sgml deleted file mode 100644 index 85479fed2..000000000 --- a/docs/reference/gtk/tmpl/gtkmodelsimple.sgml +++ /dev/null @@ -1,72 +0,0 @@ - -GtkModelSimple - - - - - - - - - - - - - - - - - - - -@parent: -@stamp: - - - - - - -@Returns: - - - - - - - -@simple: -@path: -@iter: - - - - - - - -@simple: -@path: -@iter: - - - - - - - -@simple: -@path: -@iter: - - - - - - - -@simple: -@path: -@iter: - - diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml index a51536f49..9e22ef178 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 9857e288c..18a7eace9 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 b7fc2edbb..c59280ccf 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 c65944894..2e15eeb0c 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 3302b5d06..c2bdafecc 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 59a5511b7..96672e06a 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 f67d36e6e..e9faae556 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 3e44bb019..4492a98be 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 fcf22cdc6..4445609d5 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 1e73d3956..679d28430 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 e34f3e25e..877a40d09 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 5a0e96b4f..52cf2e8c1 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 916372fbc..7b28651e4 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 da03752f9..adf0c1ebd 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,7 +434,7 @@ Styles @height: - + @@ -474,14 +443,16 @@ Styles @window: @state_type: @shadow_type: -@arrow_type: @x: @y: @width: @height: +@gap_side: +@gap_x: +@gap_width: - + @@ -494,12 +465,10 @@ Styles @y: @width: @height: -@gap_side: -@gap_x: -@gap_width: +@orientation: - + @@ -512,10 +481,9 @@ Styles @y: @width: @height: -@orientation: - + @@ -523,14 +491,12 @@ Styles @style: @window: @state_type: -@shadow_type: @x: @y: -@width: -@height: +@is_open: - + @@ -538,19 +504,12 @@ Styles @style: @window: @state_type: -@shadow_type: -@area: -@widget: -@detail: -@arrow_type: -@fill: @x: @y: -@width: -@height: +@layout: - + @@ -562,13 +521,15 @@ Styles @area: @widget: @detail: +@arrow_type: +@fill: @x: @y: @width: @height: - + @@ -584,12 +545,9 @@ Styles @y: @width: @height: -@gap_side: -@gap_x: -@gap_width: - + @@ -605,9 +563,12 @@ Styles @y: @width: @height: +@gap_side: +@gap_x: +@gap_width: - + @@ -749,7 +710,7 @@ Styles @height: - + @@ -761,13 +722,12 @@ Styles @area: @widget: @detail: -@x: -@y: -@width: -@height: +@points: +@npoints: +@fill: - + @@ -779,12 +739,13 @@ Styles @area: @widget: @detail: -@points: -@npoints: -@fill: +@x: +@y: +@width: +@height: - + @@ -796,14 +757,16 @@ Styles @area: @widget: @detail: -@arrow_type: @x: @y: @width: @height: +@gap_side: +@gap_x: +@gap_width: - + @@ -819,9 +782,10 @@ Styles @y: @width: @height: +@orientation: - + @@ -829,20 +793,15 @@ Styles @style: @window: @state_type: -@shadow_type: @area: @widget: @detail: @x: @y: -@width: -@height: -@gap_side: -@gap_x: -@gap_width: +@string: - + @@ -858,10 +817,9 @@ Styles @y: @width: @height: -@orientation: - + @@ -872,12 +830,12 @@ Styles @area: @widget: @detail: +@y1: +@y2: @x: -@y: -@string: - + @@ -885,17 +843,15 @@ Styles @style: @window: @state_type: -@shadow_type: @area: @widget: @detail: @x: @y: -@width: -@height: +@is_open: - + @@ -906,8 +862,8 @@ Styles @area: @widget: @detail: -@y1: -@y2: @x: +@y: +@layout: diff --git a/docs/reference/gtk/tmpl/gtktable.sgml b/docs/reference/gtk/tmpl/gtktable.sgml index 74fe50b42..3ca973b37 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 04a52b5f9..e71f07a83 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 c8f072322..64ad8b400 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 4fd0e08ca..522ea9fda 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 d9a996418..204b00be5 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 52a9945a4..8858fd780 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,24 +317,9 @@ 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. @@ -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 808e424b4..d2621b8ed 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,167 +128,174 @@ types related to the text widget and how they work together. @visible_rect: - + @text_view: -@wrap_mode: +@iter: +@location: - + @text_view: -@Returns: +@target_iter: +@y: +@line_top: - + @text_view: -@setting: +@iter: +@y: +@height: - + @text_view: -@Returns: +@iter: +@x: +@y: - + @text_view: -@setting: +@win: +@buffer_x: +@buffer_y: +@window_x: +@window_y: - + @text_view: -@Returns: +@win: +@window_x: +@window_y: +@buffer_x: +@buffer_y: - + @text_view: -@iter: -@location: +@win: +@Returns: - + @text_view: -@target_iter: -@y: -@line_top: +@window: +@Returns: - + @text_view: -@iter: -@y: -@height: +@type: +@size: - + @text_view: -@iter: -@x: -@y: +@width: +@height: - + @text_view: -@win: -@buffer_x: -@buffer_y: -@window_x: -@window_y: +@iter: +@Returns: - + @text_view: -@win: -@window_x: -@window_y: -@buffer_x: -@buffer_y: +@iter: +@Returns: - + @text_view: -@win: +@iter: @Returns: - + @text_view: -@window: +@iter: @Returns: - + @text_view: -@type: -@size: +@iter: +@Returns: - + @text_view: -@width: -@height: +@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 820526f24..eb2467af9 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 65f98af29..5a7fe1cf8 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 3fe21b821..921154df5 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 52a372fc3..f188e9b48 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/gtktreemodelsimple.sgml b/docs/reference/gtk/tmpl/gtktreemodelsimple.sgml new file mode 100644 index 000000000..a3ae2da10 --- /dev/null +++ b/docs/reference/gtk/tmpl/gtktreemodelsimple.sgml @@ -0,0 +1,72 @@ + +GtkModelSimple + + + + + + + + + + + + + + + + + + + +@parent: +@stamp: + + + + + + +@Returns: + + + + + + + +@simple: +@path: +@iter: + + + + + + + +@simple: +@path: +@iter: + + + + + + + +@simple: +@path: +@iter: + + + + + + + +@simple: +@path: +@iter: + + diff --git a/docs/reference/gtk/tmpl/gtktreemodelsort.sgml b/docs/reference/gtk/tmpl/gtktreemodelsort.sgml index 6eddb40c1..9fa7048ef 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: +@child_path: +@Returns: + +@path: - + @tree_model_sort: -@path: -@Returns: +@sort_iter: +@child_iter: diff --git a/docs/reference/gtk/tmpl/gtktreeselection.sgml b/docs/reference/gtk/tmpl/gtktreeselection.sgml index 21408a18b..eb6d2695c 100644 --- a/docs/reference/gtk/tmpl/gtktreeselection.sgml +++ b/docs/reference/gtk/tmpl/gtktreeselection.sgml @@ -14,7 +14,7 @@ GtkTreeSelection - + @@ -44,34 +44,35 @@ GtkTreeSelection @data: - + -@Returns: +@selection: +@type: - + @selection: -@type: +@func: +@data: - + @selection: -@func: -@data: +@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 bff0f90aa..92e290fc4 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 67a0f6280..b266434db 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 473d50166..a97686810 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 5b05c5e57..2790ec369 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 b46bcd7b8..0793f19c8 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. - + - + - + -- cgit v1.2.1