diff options
author | Johan Dahlin <jdahlin@async.com.br> | 2007-07-02 00:52:27 +0000 |
---|---|---|
committer | Johan Dahlin <johan@src.gnome.org> | 2007-07-02 00:52:27 +0000 |
commit | 12981692a6dbf6468357eefb303c4175cdfb4396 (patch) | |
tree | 99bf4384766ccb330e14bab26722cd1174b7dd22 | |
parent | 30e2e891245d7f81b26408cfc5cdfea1fde59930 (diff) | |
download | gdk-pixbuf-12981692a6dbf6468357eefb303c4175cdfb4396.tar.gz |
Improve GtkBuilder DTD, remove treemodel section, add more information
2007-07-01 Johan Dahlin <jdahlin@async.com.br>
* gtk/tmpl/gtkbuilder.sgml:
* gtk/tmpl/gtkexpander.sgml:
* gtk/tmpl/gtkframe.sgml:
* gtk/tmpl/gtknotebook.sgml:
* gtk/tmpl/gtktreemodel.sgml: Improve GtkBuilder DTD,
remove treemodel section, add more information about
container subclasses child attributes. #452954
svn path=/trunk/; revision=18334
-rw-r--r-- | docs/reference/ChangeLog | 10 | ||||
-rw-r--r-- | docs/reference/gtk/tmpl/gtkbuilder.sgml | 5 | ||||
-rw-r--r-- | docs/reference/gtk/tmpl/gtkexpander.sgml | 2 | ||||
-rw-r--r-- | docs/reference/gtk/tmpl/gtkframe.sgml | 2 | ||||
-rw-r--r-- | docs/reference/gtk/tmpl/gtknotebook.sgml | 4 | ||||
-rw-r--r-- | docs/reference/gtk/tmpl/gtktreemodel.sgml | 21 |
6 files changed, 20 insertions, 24 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 031c53d19..07f9fc359 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,13 @@ +2007-07-01 Johan Dahlin <jdahlin@async.com.br> + + * gtk/tmpl/gtkbuilder.sgml: + * gtk/tmpl/gtkexpander.sgml: + * gtk/tmpl/gtkframe.sgml: + * gtk/tmpl/gtknotebook.sgml: + * gtk/tmpl/gtktreemodel.sgml: Improve GtkBuilder DTD, + remove treemodel section, add more information about + container subclasses child attributes. #452954 + 2007-07-01 Matthias Clasen <mclasen@redhat.com> * gtk/tmpl/*.sgml: Document GtkBuilder ui definitions. diff --git a/docs/reference/gtk/tmpl/gtkbuilder.sgml b/docs/reference/gtk/tmpl/gtkbuilder.sgml index 6050b877f..462400f14 100644 --- a/docs/reference/gtk/tmpl/gtkbuilder.sgml +++ b/docs/reference/gtk/tmpl/gtkbuilder.sgml @@ -44,15 +44,16 @@ which are more limited in scope. <!ELEMENT child (object|ANY*) > <!ATTLIST interface domain #IMPLIED > -<!ATTLIST object class #REQUIRED +<!ATTLIST object id #REQUIRED + class #IMPLIED type-func #IMPLIED - id #IMPLIED constructor #IMPLIED > <!ATTLIST property name #REQUIRED translatable #IMPLIED > <!ATTLIST signal name #REQUIRED handler #REQUIRED after #IMPLIED + swapped #IMPLIED object #IMPLIED > <!ATTLIST child type #IMPLIED internal-child #IMPLIED > diff --git a/docs/reference/gtk/tmpl/gtkexpander.sgml b/docs/reference/gtk/tmpl/gtkexpander.sgml index 37482eb78..4a6206025 100644 --- a/docs/reference/gtk/tmpl/gtkexpander.sgml +++ b/docs/reference/gtk/tmpl/gtkexpander.sgml @@ -63,6 +63,8 @@ expander_callback (GObject *object, The GtkExpander implementation of the GtkBuildable interface supports placing a child in the label position by specifying "label" as the "type" attribute of a <child> element. +A normal content child can be specified without specifying +a <child> type attribute. </para> <example> <title>A UI definition fragment with GtkExpander</title> diff --git a/docs/reference/gtk/tmpl/gtkframe.sgml b/docs/reference/gtk/tmpl/gtkframe.sgml index 8f2bb4f01..3fcbc2b12 100644 --- a/docs/reference/gtk/tmpl/gtkframe.sgml +++ b/docs/reference/gtk/tmpl/gtkframe.sgml @@ -19,6 +19,8 @@ label can be controlled with gtk_frame_set_label_align(). The GtkFrame implementation of the GtkBuildable interface supports placing a child in the label position by specifying "label" as the "type" attribute of a <child> element. +A normal content child can be specified without specifying +a <child> type attribute. </para> <example> <title>A UI definition fragment with GtkFrame</title> diff --git a/docs/reference/gtk/tmpl/gtknotebook.sgml b/docs/reference/gtk/tmpl/gtknotebook.sgml index ba0ad64d6..d50827b8d 100644 --- a/docs/reference/gtk/tmpl/gtknotebook.sgml +++ b/docs/reference/gtk/tmpl/gtknotebook.sgml @@ -24,8 +24,10 @@ will be a popup menu allowing the users to switch pages. <para> The GtkNoteboopk implementation of the GtkBuildable interface supports placing children into tabs by specifying "tab" as the -"type" attribbute of a <child> element. Note that the content +"type" attribute of a <child> element. Note that the content of the tab must be created before the tab can be filled. +A tab child can be specified without specifying a <child> +type attribute. </para> <example> <title>A UI definition fragment with GtkNotebook</title> diff --git a/docs/reference/gtk/tmpl/gtktreemodel.sgml b/docs/reference/gtk/tmpl/gtktreemodel.sgml index 8b6c7408c..3bd3dfcc2 100644 --- a/docs/reference/gtk/tmpl/gtktreemodel.sgml +++ b/docs/reference/gtk/tmpl/gtktreemodel.sgml @@ -188,27 +188,6 @@ enum </example> </para> -<refsect2 id="GtkTreeModel-BUILDER-UI"> -<title>GtkTreeModel as GtkBuildable</title> -<para> -The GtkTreeStore implementation of the GtkBuildable interface allows -to specify the model columns with a <columns> element that may -contain multiple <column> elements, each specifying one model -column. The "type" attribute specifies the data type for the column. -</para> -<example> -<title>A UI definition fragment with GtkTreeStore</title> -<programlisting><![CDATA[ -<object class="GtkTreeStore"> - <columns> - <column type="gchararray"/> - <column type="guint"/> - </columns> -</object> -]]></programlisting> -</example> -</refsect2> - <!-- ##### SECTION See_Also ##### --> <para> #GtkTreeView, #GtkTreeStore, #GtkListStore, <link linkend="gtk-GtkTreeView-drag-and-drop">GtkTreeDnd</link>, #GtkTreeSortable |