diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-06-19 03:20:07 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-06-19 03:20:07 +0000 |
| commit | 64bfd86b5b532b07af0225d9983f713b7982b06a (patch) | |
| tree | 7f58d46941011452d565992a3c33ae6336fa219f /docs | |
| parent | 58a30d5f5ab308e0a20abfdebcdff5cb5b90eba3 (diff) | |
| download | gtk+-64bfd86b5b532b07af0225d9983f713b7982b06a.tar.gz | |
Allow to construct menu tool buttons.
2005-06-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c: Allow to construct menu tool buttons.
* demos/gtk-demo/appwindow.c: Demonstrate menu tool buttons
constructed with GtkUIManager.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/reference/ChangeLog | 3 | ||||
| -rw-r--r-- | docs/reference/gtk/tmpl/gtkuimanager.sgml | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 42d5fdcd5a..ad452d8d38 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,5 +1,8 @@ 2005-06-18 Matthias Clasen <mclasen@redhat.com> + * gtk/tmpl/gtkuimanager.sgml: Document that + toolitem elements may have menu subelements. + * gtk/gtk-sections.txt: Updates 2005-06-17 Matthias Clasen <mclasen@redhat.com> diff --git a/docs/reference/gtk/tmpl/gtkuimanager.sgml b/docs/reference/gtk/tmpl/gtkuimanager.sgml index ac3b5aa995..956617f290 100644 --- a/docs/reference/gtk/tmpl/gtkuimanager.sgml +++ b/docs/reference/gtk/tmpl/gtkuimanager.sgml @@ -22,7 +22,7 @@ roughly described by the following DTD. <!ELEMENT toolbar (toolitem|separator|placeholder)* > <!ELEMENT placeholder (menuitem|toolitem|separator|placeholder|menu)* > <!ELEMENT menuitem EMPTY > -<!ELEMENT toolitem EMPTY > +<!ELEMENT toolitem (menu?) > <!ELEMENT separator EMPTY > <!ELEMENT accelerator EMPTY > <!ATTLIST menubar name #IMPLIED @@ -115,7 +115,8 @@ action</para></listitem> </varlistentry> <varlistentry><term>toolitem</term> <listitem><para>a #GtkToolItem subclass, the exact type depends on the -action</para></listitem> +action. Note that toolitem elements may contain a menu element, but only +if their associated action specifies a #GtkMenuToolButton as proxy.</para></listitem> </varlistentry> <varlistentry><term>separator</term> <listitem><para>a #GtkSeparatorMenuItem or |