Change GtkToolItem to retrieve its properties from GtkToolShell interface,

instead of relying on being child of a GtkToolbar. (#5034079)

* gtk/gtk.symbols, docs/reference/gtk/gtk-docs.sgml,
docs/reference/gtk/gtk-sections.txt: Add GtkToolShell symbols.
* docs/reference/gtk/tmpl/gtktoolitem.sgml: Move section docs inline.
* gtk/gtktoolbar.c: Implement GtkToolShellIface.
* gtk/gtktoolbar.h: Remove _gtk_toolbar_rebuild_menu.
* gtk/gtktoolitem.c: Use GtkToolShell, instead of GtkToolbar.
Take section docs from template file and update them for GtkToolShell.
* gtk/Makefile.am: Add gtk/gtktoolshell.c and gtk/gtktoolshell.h.
* gtk/gtktoolshell.c, gtk/gtktoolshell.h: New GtkToolShellIface.

svn path=/trunk/; revision=19177

3 files changed, 24 insertions, 17 deletions

diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 114e143ef7..0fa1200acd 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -135,6 +135,7 @@
 <!ENTITY GtkToggleAction SYSTEM "xml/gtktoggleaction.xml">
 <!ENTITY GtkToggleButton SYSTEM "xml/gtktogglebutton.xml">
 <!ENTITY GtkToggleToolButton SYSTEM "xml/gtktoggletoolbutton.xml">
+<!ENTITY GtkToolShell SYSTEM "xml/gtktoolshell.xml">
 <!ENTITY GtkToolbar SYSTEM "xml/gtktoolbar.xml">
 <!ENTITY GtkToolButton SYSTEM "xml/gtktoolbutton.xml">
 <!ENTITY GtkToolItem SYSTEM "xml/gtktoolitem.xml">
@@ -239,6 +240,7 @@
     <releaseinfo>for GTK+ &version;</releaseinfo>
   </bookinfo>
 
+<!--
   <part id="gtk">
     <title>GTK+ Overview</title>
     <partintro>
@@ -441,7 +443,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
         &GtkListStore;
         &GtkTreeStore;
     </chapter>
-
+-->
     <chapter id="MenusAndCombos">
       <title>Menus, Combo Box, Toolbar</title>
 	&GtkComboBox;
@@ -454,6 +456,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
         &GtkCheckMenuItem;      
         &GtkSeparatorMenuItem;
         &GtkTearoffMenuItem;
+        &GtkToolShell;
         &GtkToolbar;
         &GtkToolItem;
         &GtkSeparatorToolItem;
@@ -462,7 +465,7 @@ that is, GUI components such as #GtkButton or #GtkTextView.
         &GtkToggleToolButton;
         &GtkRadioToolButton;
     </chapter>
- 
+<!--
     <chapter id="Actions">
       <title>Action-based menus and toolbars</title>
         &GtkUIManager;
@@ -684,5 +687,5 @@ that is, GUI components such as #GtkButton or #GtkTextView.
   <index role="2.12">
     <title>Index of new symbols in 2.12</title>
   </index>  
-
+-->
 </book>
diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 11ac490a50..f557f878e7 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -3927,6 +3927,21 @@ gtk_toggle_button_get_type
 </SECTION>
 
 <SECTION>
+<FILE>gtktoolshell</FILE>
+<TITLE>GtkToolShell</TITLE>
+GtkToolShell
+GtkToolShellIface
+gtk_tool_shell_get_icon_size
+gtk_tool_shell_get_orientation
+gtk_tool_shell_get_relief_style
+gtk_tool_shell_get_style
+gtk_tool_shell_rebuild_menu
+
+<SUBSECTION Private>
+gtk_tool_shell_get_type
+</SECTION>
+
+<SECTION>
 <FILE>gtktoolbar</FILE>
 <TITLE>GtkToolbar</TITLE>
 GtkToolbar
@@ -6691,3 +6706,4 @@ GTK_PAGE_SETUP_UNIX_DIALOG_GET_CLASS
 GtkPageSetupUnixDialogPrivate
 gtk_page_setup_unix_dialog_get_type
 </SECTION>
+
diff --git a/docs/reference/gtk/tmpl/gtktoolitem.sgml b/docs/reference/gtk/tmpl/gtktoolitem.sgml
index faad989705..ee97752dc7 100644
--- a/docs/reference/gtk/tmpl/gtktoolitem.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolitem.sgml
@@ -2,21 +2,10 @@
 GtkToolItem
 
 <!-- ##### SECTION Short_Description ##### -->
-The base class of widgets that can be added to GtkToolbar
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
-#GtkToolItem<!-- -->s are widgets that can appear on a toolbar. To
-create a toolbar item that contain something else than a button, use
-gtk_tool_item_new(). Use gtk_container_add() to add a child
-widget to the tool item.
-</para>
-<para>
-For toolbar items that contain buttons, see the #GtkToolButton,
-#GtkToggleToolButton and #GtkRadioToolButton classes.
-</para>
-See the #GtkToolbar class for a description of the toolbar widget.
-<para>
+
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
@@ -46,8 +35,7 @@ See the #GtkToolbar class for a description of the toolbar widget.
 
 <!-- ##### STRUCT GtkToolItem ##### -->
 <para>
-The GtkToolItem struct contains only private data. It should only be
-accessed through the functions described below.
+
 </para>