swap icon_widget and label arguments to match BonoboUIToolbarButton.

Wed Jul 30 17:03:58 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktoolbutton.[ch]:
	(gtk_tool_button_new): swap icon_widget and label arguments to
	match BonoboUIToolbarButton.

	* gtk/gtktoolbar.h: un-deprecate gtk_toolbar_{set|unset}_style().

3 files changed, 70 insertions, 58 deletions

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index df6231ff3c..17237fd2ac 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -1361,6 +1361,12 @@ produce superscript and subscript.
 </para>
 
 
+<!-- ##### ARG GtkToolButton:show-label-horizontally ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT GtkTreeSelectionClass ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml
index 5d5c681bb4..f2b732af91 100644
--- a/docs/reference/gtk/tmpl/gtktoolbar.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml
@@ -143,8 +143,8 @@ to a #GtkToolbar.
 
 </para>
 
-@toolbar:
-@orientation:
+@toolbar: 
+@orientation: 
 
 
 <!-- ##### FUNCTION gtk_toolbar_set_tooltips ##### -->
@@ -152,8 +152,8 @@ to a #GtkToolbar.
 
 </para>
 
-@toolbar:
-@enable:
+@toolbar: 
+@enable: 
 
 
 <!-- ##### FUNCTION gtk_toolbar_unset_icon_size ##### -->
@@ -223,14 +223,14 @@ to a #GtkToolbar.
 
 </para>
 
-@toolbar:
-@text:
-@tooltip_text:
-@tooltip_private_text:
-@icon:
-@callback:
-@user_data:
-@Returns:
+@toolbar: 
+@text: 
+@tooltip_text: 
+@tooltip_private_text: 
+@icon: 
+@callback: 
+@user_data: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_toolbar_prepend_item ##### -->
@@ -238,14 +238,14 @@ to a #GtkToolbar.
 
 </para>
 
-@toolbar:
-@text:
-@tooltip_text:
-@tooltip_private_text:
-@icon:
-@callback:
-@user_data:
-@Returns:
+@toolbar: 
+@text: 
+@tooltip_text: 
+@tooltip_private_text: 
+@icon: 
+@callback: 
+@user_data: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_toolbar_insert_item ##### -->
@@ -253,15 +253,15 @@ to a #GtkToolbar.
 
 </para>
 
-@toolbar:
-@text:
-@tooltip_text:
-@tooltip_private_text:
-@icon:
-@callback:
-@user_data:
-@position:
-@Returns:
+@toolbar: 
+@text: 
+@tooltip_text: 
+@tooltip_private_text: 
+@icon: 
+@callback: 
+@user_data: 
+@position: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_toolbar_append_space ##### -->
@@ -269,7 +269,7 @@ to a #GtkToolbar.
 
 </para>
 
-@toolbar:
+@toolbar: 
 
 
 <!-- ##### FUNCTION gtk_toolbar_prepend_space ##### -->
@@ -277,7 +277,7 @@ to a #GtkToolbar.
 
 </para>
 
-@toolbar:
+@toolbar: 
 
 
 <!-- ##### FUNCTION gtk_toolbar_insert_space ##### -->
@@ -285,8 +285,8 @@ to a #GtkToolbar.
 
 </para>
 
-@toolbar:
-@position:
+@toolbar: 
+@position: 
 
 
 <!-- ##### FUNCTION gtk_toolbar_append_element ##### -->
@@ -297,16 +297,16 @@ to a #GtkToolbar.
 
 </para>
 
-@toolbar:
-@type:
-@widget:
-@text:
-@tooltip_text:
-@tooltip_private_text:
-@icon:
-@callback:
-@user_data:
-@Returns:
+@toolbar: 
+@type: 
+@widget: 
+@text: 
+@tooltip_text: 
+@tooltip_private_text: 
+@icon: 
+@callback: 
+@user_data: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_toolbar_prepend_element ##### -->
@@ -317,16 +317,16 @@ to a #GtkToolbar.
 I
 </para>
 
-@toolbar:
-@type:
-@widget:
-@text:
-@tooltip_text:
-@tooltip_private_text:
-@icon:
-@callback:
-@user_data:
-@Returns:
+@toolbar: 
+@type: 
+@widget: 
+@text: 
+@tooltip_text: 
+@tooltip_private_text: 
+@icon: 
+@callback: 
+@user_data: 
+@Returns: 
 
 
 <!-- ##### FUNCTION gtk_toolbar_insert_element ##### -->
@@ -386,8 +386,8 @@ I
 
 </para>
 
-@toolbar:
-@style:
+@toolbar: 
+@style: 
 
 
 <!-- ##### FUNCTION gtk_toolbar_insert_stock ##### -->
@@ -464,14 +464,20 @@ I
 
 @toolbar: the object which received the signal.
 @Returns: 
+@: 
+@:
+@Returns: 
+@:
+@Returns: 
+@Returns: 
 
 <!-- ##### SIGNAL GtkToolbar::style-changed ##### -->
 <para>
 
 </para>
 
-@toolbar:
-@style:
+@toolbar: 
+@style: 
 
 <!-- ##### ARG GtkToolbar:orientation ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtktoolbutton.sgml b/docs/reference/gtk/tmpl/gtktoolbutton.sgml
index 19b5ae2a3f..6fa2e61e28 100644
--- a/docs/reference/gtk/tmpl/gtktoolbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolbutton.sgml
@@ -25,8 +25,8 @@ GtkToolButton
 
 </para>
 
-@label: 
 @icon_widget: 
+@label: 
 @Returns: