Add deprecation notes pointing people to GtkComboBox.

3 files changed, 31 insertions, 22 deletions

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 59113ab26..d48b05e0a 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,9 @@
+Sun Feb 15 22:09:53 2004  Matthias Clasen  <maclas@gmx.de>
+
+	* gtk/tmpl/gtkcombo.sgml: 
+	* gtk/tmpl/gtkoptionmenu.sgml: Add deprecation notes pointing
+	people to GtkComboBox.
+
 Sun Feb 15 02:46:53 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/tmpl/gtktreednd.sgml: Add docs.
diff --git a/docs/reference/gtk/tmpl/gtkcombo.sgml b/docs/reference/gtk/tmpl/gtkcombo.sgml
index 5263ac2d7..f5b13af45 100644
--- a/docs/reference/gtk/tmpl/gtkcombo.sgml
+++ b/docs/reference/gtk/tmpl/gtkcombo.sgml
@@ -23,6 +23,9 @@ By default, the user can step through the items in the list using the
 arrow (cursor) keys, though this behaviour can be turned off with
 gtk_combo_set_use_arrows().
 </para>
+<para>
+As of GTK+ 2.4, #GtkCombo has been deprecated in favor of #GtkComboBox.
+</para>
 
 <example id="gtkcombo-simple-example">
 <title>Creating a <structname>GtkCombo</structname> widget with simple text 
@@ -85,26 +88,10 @@ items.</title>
 The #GtkFixedChild-struct struct contains the following fields.
 (These fields should be considered read-only. They should never be set by
 an application.)
-
-<informaltable pgwide="1" frame="none" role="struct">
-<tgroup cols="2"><colspec colwidth="2*"/><colspec colwidth="8*"/>
-<tbody>
-
-<row>
-<entry>#GtkWidget *entry;</entry>
-<entry>the text entry field.</entry>
-</row>
-
-<row>
-<entry>#GtkWidget *list;</entry>
-<entry>the list shown in the drop-down window.</entry>
-</row>
-
-</tbody></tgroup></informaltable>
 </para>
 
-@entry: 
-@list: 
+@entry: the text entry field.
+@list: the list shown in the drop-down window.
 
 <!-- ##### ARG GtkCombo:allow-empty ##### -->
 <para>
@@ -137,6 +124,7 @@ Creates a new #GtkCombo.
 </para>
 
 @Returns: a new #GtkCombo.
+@Deprecated: Use #GtkComboBox instead.
 
 
 <!-- ##### FUNCTION gtk_combo_set_popdown_strings ##### -->
@@ -147,6 +135,7 @@ Convenience function to set all of the items in the popup list.
 
 @combo: a #GtkCombo.
 @strings: a list of strings, or %NULL to clear the popup list
+@Deprecated: Use #GtkComboBox instead.
 
 
 <!-- ##### FUNCTION gtk_combo_set_value_in_list ##### -->
@@ -162,6 +151,7 @@ If an empty field is acceptable, the @ok_if_empty parameter should be %TRUE.
 @combo: a #GtkCombo.
 @val: %TRUE if the value entered must match one of the values in the list.
 @ok_if_empty: %TRUE if an empty value is considered valid.
+@Deprecated: Use #GtkComboBox instead.
 
 
 <!-- ##### FUNCTION gtk_combo_set_use_arrows ##### -->
@@ -171,7 +161,9 @@ the list. This is on by default.
 </para>
 
 @combo: a #GtkCombo.
-@val: %TRUE if the arrow keys can be used to step through the items in the list.
+@val: %TRUE if the arrow keys can be used to step through the items in 
+     the list.
+@Deprecated: Use #GtkComboBox instead.
 
 
 <!-- ##### FUNCTION gtk_combo_set_use_arrows_always ##### -->
@@ -181,6 +173,7 @@ Obsolete function, does nothing.
 
 @combo: a #GtkCombo.
 @val: unused
+@Deprecated: Use #GtkComboBox instead.
 
 
 <!-- ##### FUNCTION gtk_combo_set_case_sensitive ##### -->
@@ -196,6 +189,7 @@ worried about differences in case.
 
 @combo: a #GtkCombo.
 @val: %TRUE if the text in the list items is case sensitive.
+@Deprecated: Use #GtkComboBox instead.
 
 
 <!-- ##### FUNCTION gtk_combo_set_item_string ##### -->
@@ -207,6 +201,7 @@ selected. This is needed if the list item is not a simple label.
 @combo: a #GtkCombo.
 @item: a #GtkItem.
 @item_value: the string to place in the #GtkEntry when @item is selected.
+@Deprecated: Use #GtkComboBox instead.
 
 
 <!-- ##### FUNCTION gtk_combo_disable_activate ##### -->
@@ -218,5 +213,6 @@ instead.
 </para>
 
 @combo: a #GtkCombo.
+@Deprecated: Use #GtkComboBox instead.
 
 
diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
index c2cf8f852..f308907f0 100644
--- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
@@ -22,6 +22,10 @@ the option menu; in the "changed" signal, check the new selected
 menu item with gtk_option_menu_get_history().
 </para>
 
+<para>
+As of GTK+ 2.4, #GtkOptionMenu has been deprecated in favor of #GtkComboBox.
+</para>
+
 <!-- ##### SECTION See_Also ##### -->
 
 
@@ -60,7 +64,7 @@ Creates a new #GtkOptionMenu.
 </para>
 
 @Returns: a new #GtkOptionMenu.
-
+@Deprecated: Use #GtkComboBox instead.
 
 <!-- ##### FUNCTION gtk_option_menu_get_menu ##### -->
 <para>
@@ -69,6 +73,7 @@ Returns the #GtkMenu associated with the #GtkOptionMenu.
 
 @option_menu: a #GtkOptionMenu.
 @Returns: the #GtkMenu associated with the #GtkOptionMenu.
+@Deprecated: Use #GtkComboBox instead.
 
 
 <!-- ##### FUNCTION gtk_option_menu_set_menu ##### -->
@@ -80,6 +85,7 @@ use of tearoff menu items, submenus, and accelerators.
 
 @option_menu: a #GtkOptionMenu.
 @menu: the #GtkMenu to associate with the #GtkOptionMenu.
+@Deprecated: Use #GtkComboBox instead.
 
 
 <!-- ##### FUNCTION gtk_option_menu_remove_menu ##### -->
@@ -88,6 +94,7 @@ Removes the menu from the option menu.
 </para>
 
 @option_menu: a #GtkOptionMenu.
+@Deprecated: Use #GtkComboBox instead.
 
 
 <!-- ##### FUNCTION gtk_option_menu_set_history ##### -->
@@ -97,8 +104,8 @@ selected value for the option menu.
 </para>
 
 @option_menu: a #GtkOptionMenu.
-@index_: the index of the menu item to select.  Index values are from 
-0 to n-1.
+@index_: the index of the menu item to select.  Index values are from 0 to n-1.
+@Deprecated: Use #GtkComboBox instead.
 
 
 <!-- ##### FUNCTION gtk_option_menu_get_history ##### -->