Remove references to nonexisting functions.

        * gtk/tmpl/gtkbbox.sgml: Remove references to nonexisting functions.

        * gtk/tmpl/gtkcolorseldlg.sgml, gtk/tmpl/gtkdrawingarea.sgml,
        gtk/tmpl/gtkmain.sgml, gtk/tmpl/gtkhseparator.sgml,
        gtk/tmpl/gtktree.sgml, gtk/tmpl/gtkradiobutton.sgml,
        gtk/tmpl/gtkradiomenuitem.sgml:
        Replace references to deprecated functions.

        * gtk/tmpl/gtkhbbox.sgml,gtk/tmpl/gtkvbbox.sgml: Minor fixes.

10 files changed, 71 insertions, 81 deletions

diff --git a/docs/reference/gtk/tmpl/gtkbbox.sgml b/docs/reference/gtk/tmpl/gtkbbox.sgml
index 38d13b2f76..b57f1a58ee 100644
--- a/docs/reference/gtk/tmpl/gtkbbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkbbox.sgml
@@ -5,74 +5,63 @@ GtkButtonBox
 Base class for #GtkHButtonBox and #GtkVButtonBox
 
 <!-- ##### SECTION Long_Description ##### -->
-<para>

-The primary purpose of this class is to keep track of the various properties

-of #GtkHButtonBox and #GtkVButtonBox widgets.

-</para>

-<para>

-gtk_button_box_get_child_size_default() retrieves the default minimum width and height 

-for widgets in any button box. gtk_button_box_set_child_size_default()

-changes the default minimum child widget size.

-</para>

-<para>

-gtk_button_box_get_child_size() retrieves the minimum width and height 

-for widgets in a given button box. gtk_button_box_set_child_size() 

-allows those properties to be changed.

-</para>

-<para>

-gtk_button_box_get_child_ipadding_default() gets the default number of pixels of 

-horizontal and vertical padding that are applied to each button in every button box.

-gtk_button_box_set_child_ipadding_default() allows these defaults to be

-changed.

-</para>

-<para>

-The internal padding of buttons can be retrieved and changed per button box using

-gtk_button_box_get_child_ipadding() and gtk_button_box_set_child_ipadding()

-respectively.

-</para>

-<para>

-gtk_button_box_get_spacing() and gtk_button_box_set_spacing() retrieve and

-change default number of pixels between buttons, respectively.

-</para>

-<para>

-gtk_button_box_get_layout() and gtk_button_box_set_layout() retrieve and alter the method

-used to spread the buttons in a button box across the container, respectively.

-</para>

-

-<para>

-

+<para>
+The primary purpose of this class is to keep track of the various properties
+of #GtkHButtonBox and #GtkVButtonBox widgets.
+</para>
+<para>
+gtk_button_box_get_child_size() retrieves the minimum width and height 
+for widgets in a given button box. gtk_button_box_set_child_size() 
+allows those properties to be changed.
+</para>
+<para>
+The internal padding of buttons can be retrieved and changed per button box using
+gtk_button_box_get_child_ipadding() and gtk_button_box_set_child_ipadding()
+respectively.
+</para>
+<para>
+gtk_button_box_get_spacing() and gtk_button_box_set_spacing() retrieve and
+change default number of pixels between buttons, respectively.
+</para>
+<para>
+gtk_button_box_get_layout() and gtk_button_box_set_layout() retrieve and alter the method
+used to spread the buttons in a button box across the container, respectively.
+</para>
+
+<para>
+
 </para>
 
 <!-- ##### SECTION See_Also ##### -->
-<para>

-<variablelist>

-<varlistentry>

-<term>#GtkVButtonBox</term>

-<listitem><para>Vertical sub-class of #GtkButtonBox.</para></listitem>

-</varlistentry>

-<varlistentry>

-<term>#GtkHButtonBox</term>

-<listitem><para>Horizontal sub-class of #GtkButtonBox.</para></listitem>

-</varlistentry>

-</variablelist>

+<para>
+<variablelist>
+<varlistentry>
+<term>#GtkVButtonBox</term>
+<listitem><para>Vertical sub-class of #GtkButtonBox.</para></listitem>
+</varlistentry>
+<varlistentry>
+<term>#GtkHButtonBox</term>
+<listitem><para>Horizontal sub-class of #GtkButtonBox.</para></listitem>
+</varlistentry>
+</variablelist>
 </para>
 
 <!-- ##### STRUCT GtkButtonBox ##### -->
-<para>

-This is a read-only struct; no members should be modified directly.

+<para>
+This is a read-only struct; no members should be modified directly.
 </para>
 
 
 <!-- ##### MACRO GTK_BUTTONBOX_DEFAULT ##### -->
-<para>

-Used internally only.

+<para>
+Used internally only.
 </para>
 
 
 
 <!-- ##### MACRO gtk_button_box_get_spacing ##### -->
-<para>

-Retrieves how much space a button box is placing between each child button.

+<para>
+Retrieves how much space a button box is placing between each child button.
 </para>
 
 @b: 
@@ -82,8 +71,8 @@ Retrieves how much space a button box is placing between each child button.
 
 
 <!-- ##### FUNCTION gtk_button_box_get_layout ##### -->
-<para>

-Retrieves the method being used to arrange the buttons in a button box.

+<para>
+Retrieves the method being used to arrange the buttons in a button box.
 </para>
 
 @widget: a #GtkButtonBox.
@@ -91,9 +80,9 @@ Retrieves the method being used to arrange the buttons in a button box.
 
 
 <!-- ##### FUNCTION gtk_button_box_get_child_size ##### -->
-<para>

-Retrieves the current width and height of all child widgets in a button box.

-@min_width and @min_height are filled with those values, respectively.

+<para>
+Retrieves the current width and height of all child widgets in a button box.
+@min_width and @min_height are filled with those values, respectively.
 </para>
 
 @widget: a #GtkButtonBox.
@@ -102,8 +91,8 @@ Retrieves the current width and height of all child widgets in a button box.
 
 
 <!-- ##### FUNCTION gtk_button_box_get_child_ipadding ##### -->
-<para>

-Gets the default number of pixels that pad the buttons in a given button box.

+<para>
+Gets the default number of pixels that pad the buttons in a given button box.
 </para>
 
 @widget: a #GtkButtonBox.
@@ -112,8 +101,8 @@ Gets the default number of pixels that pad the buttons in a given button box.
 
 
 <!-- ##### MACRO gtk_button_box_set_spacing ##### -->
-<para>

-Sets the amount of spacing between buttons in a given button box.

+<para>
+Sets the amount of spacing between buttons in a given button box.
 </para>
 
 @b: 
@@ -124,8 +113,8 @@ Sets the amount of spacing between buttons in a given button box.
 
 
 <!-- ##### FUNCTION gtk_button_box_set_layout ##### -->
-<para>

-Changes the way buttons are arranged in their container.

+<para>
+Changes the way buttons are arranged in their container.
 </para>
 
 @widget: a #GtkButtonBox.
@@ -133,8 +122,8 @@ Changes the way buttons are arranged in their container.
 
 
 <!-- ##### FUNCTION gtk_button_box_set_child_size ##### -->
-<para>

-Sets a new default size for the children of a given button box.

+<para>
+Sets a new default size for the children of a given button box.
 </para>
 
 @widget: a #GtkButtonBox.
@@ -143,9 +132,9 @@ Sets a new default size for the children of a given button box.
 
 
 <!-- ##### FUNCTION gtk_button_box_set_child_ipadding ##### -->
-<para>

-Changes the amount of internal padding used by all buttons in a given button

-box.

+<para>
+Changes the amount of internal padding used by all buttons in a given button
+box.
 </para>
 
 @widget: a #GtkButtonBox.
diff --git a/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml b/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml
index f9f166475d..d089474325 100644
--- a/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml
+++ b/docs/reference/gtk/tmpl/gtkcolorseldlg.sgml
@@ -29,7 +29,7 @@ an application.)
 <row>
 <entry>#GtkWidget *colorsel;</entry>
 <entry>The #GtkColorSelection widget contained within the
-dialog.  Use this widget and its gtk_color_selection_get_color()
+dialog.  Use this widget and its gtk_color_selection_get_current_color()
 function to gain access to the selected color.  Connect a handler 
 for this widget's color_changed signal to be notified when the
 color changes.
diff --git a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml
index bafb109ca7..bc10611d0c 100644
--- a/docs/reference/gtk/tmpl/gtkdrawingarea.sgml
+++ b/docs/reference/gtk/tmpl/gtkdrawingarea.sgml
@@ -71,8 +71,6 @@ expose_event (GdkWidget *widget, GdkEventExpose *event, gpointer data)
 }
 [...]
   GtkWidget *drawing_area = gtk_drawing_area_new (<!>);
-  gtk_drawing_area_size (GTK_DRAWING_AREA (drawing_area),
-                         100, 100);
   gtk_signal_connect (GTK_OBJECT (drawing_area), 
 </programlisting>
 </example>
diff --git a/docs/reference/gtk/tmpl/gtkhbbox.sgml b/docs/reference/gtk/tmpl/gtkhbbox.sgml
index 889f2cf039..80da5b50af 100644
--- a/docs/reference/gtk/tmpl/gtkhbbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkhbbox.sgml
@@ -8,14 +8,14 @@ a container for arranging button horizontally.
 <para>
 A button box should be used to provide a consistent layout of buttons
 throughout your application. There is one default layout and a default
-spacing value that are persistant across all #HButtonBox widgets.
+spacing value that are persistant across all #GtkHButtonBox widgets.
 </para>
 <para>
 The layout/spacing can then be altered by the programmer, or if desired, by
 the user to alter the 'feel' of a program to a small degree.
 </para>
 <para>
-A #HButtonBox is created with gtk_hbutton_box_new(). Buttons are packed into
+A #GtkHButtonBox is created with gtk_hbutton_box_new(). Buttons are packed into
 a button box the same way as any other box, using gtk_box_pack_start() or
 gtk_box_pack_end().
 </para>
diff --git a/docs/reference/gtk/tmpl/gtkhseparator.sgml b/docs/reference/gtk/tmpl/gtkhseparator.sgml
index 3ad3e71655..c2ecaaeb23 100644
--- a/docs/reference/gtk/tmpl/gtkhseparator.sgml
+++ b/docs/reference/gtk/tmpl/gtkhseparator.sgml
@@ -15,7 +15,7 @@ make it appear sunken into the interface.
 The #GtkHSeparator widget is not used as a separator within menus.
 To create a separator in a menu create an empty #GtkSeparatorMenuItem 
 widget using gtk_separator_menu_item_new() and add it to the menu with 
-gtk_menu_append().
+gtk_menu_shell_append().
 </para>
 </note>
 
diff --git a/docs/reference/gtk/tmpl/gtkmain.sgml b/docs/reference/gtk/tmpl/gtkmain.sgml
index c90ef7af94..efa166da85 100644
--- a/docs/reference/gtk/tmpl/gtkmain.sgml
+++ b/docs/reference/gtk/tmpl/gtkmain.sgml
@@ -585,6 +585,9 @@ GTK+ to do pending redraws. This priority is lower than %GTK_PRIORITY_RESIZE
 to avoid redrawing a widget just before resizing (and therefore redrawing
 it again).
 </para>
+<note><para>
+This macro is deprecated. You should use %GDK_PRIORITY_REDRAW instead.
+</para></note>
 
 
 
diff --git a/docs/reference/gtk/tmpl/gtkradiobutton.sgml b/docs/reference/gtk/tmpl/gtkradiobutton.sgml
index 3a3ff33b65..d3117b4c8a 100644
--- a/docs/reference/gtk/tmpl/gtkradiobutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkradiobutton.sgml
@@ -30,7 +30,7 @@ gtk_radio_button_new_with_label_from_widget() is also provided.
 </para>
 <para>
 To retrieve the group a #GtkRadioButton is assigned to, use
-gtk_radio_button_group().
+gtk_radio_button_get_group().
 </para>
 <para>
 To remove a #GtkRadioButton from one group and make it part of a new one, use gtk_radio_button_set_group().
diff --git a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml
index 2d04d30866..9b8d10b3a6 100644
--- a/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml
+++ b/docs/reference/gtk/tmpl/gtkradiomenuitem.sgml
@@ -23,7 +23,7 @@ gint i;
 for(i = 0; i < 5; i++)
 {
   item = gtk_radio_menu_item_new_with_label (group, "This is an example");
-  group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item));
+  group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
   if (i == 1)
     gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
 }
diff --git a/docs/reference/gtk/tmpl/gtktree.sgml b/docs/reference/gtk/tmpl/gtktree.sgml
index 75fcfeec39..771e371029 100644
--- a/docs/reference/gtk/tmpl/gtktree.sgml
+++ b/docs/reference/gtk/tmpl/gtktree.sgml
@@ -124,7 +124,7 @@ Removes a list of items from the #GtkTree in @tree.
 If only one item is to be removed from the #GtkTree, gtk_container_remove() can be used instead.
 </para>
 <para>
-Removing an item from a #GtkTree dereferences the item, and thus usually destroys the item and any subtrees it may contain. If the item is not to be destroyed, use gtk_object_ref() before removing it.
+Removing an item from a #GtkTree dereferences the item, and thus usually destroys the item and any subtrees it may contain. If the item is not to be destroyed, use g_object_ref() before removing it.
 </para>
 
 @tree: A pointer to a #GtkTree.
@@ -136,7 +136,7 @@ Removing an item from a #GtkTree dereferences the item, and thus usually destroy
 Removes the items at positions between @start and @end from the #GtkTree @tree.
 </para>
 <para>
-Removing an item from a #GtkTree dereferences the item, and thus usually destroys the item and any subtrees it may contain. If the item is not to be destroyed, use gtk_object_ref() before removing it.
+Removing an item from a #GtkTree dereferences the item, and thus usually destroys the item and any subtrees it may contain. If the item is not to be destroyed, use g_object_ref() before removing it.
 </para>
 
 @tree: A pointer to a #GtkTree.
diff --git a/docs/reference/gtk/tmpl/gtkvbbox.sgml b/docs/reference/gtk/tmpl/gtkvbbox.sgml
index bba6c6eb03..d8c312d856 100644
--- a/docs/reference/gtk/tmpl/gtkvbbox.sgml
+++ b/docs/reference/gtk/tmpl/gtkvbbox.sgml
@@ -8,14 +8,14 @@ a container for arranging buttons vertically.
 <para>
 A button box should be used to provide a consistent layout of buttons
 throughout your application. There is one default layout and a default
-spacing value that are persistant across all #VButtonBox widgets.
+spacing value that are persistant across all #GtkVButtonBox widgets.
 </para>
 <para>
 The layout/spacing can then be altered by the programmer, or if desired, by
 the user to alter the 'feel' of a program to a small degree.
 </para>
 <para>
-A #VButtonBox is created with gtk_vbutton_box_new(). Buttons are packed into
+A #GtkVButtonBox is created with gtk_vbutton_box_new(). Buttons are packed into
 a button box the same way as any other box, using gtk_box_pack_start() or
 gtk_box_pack_end().
 </para>