[gtk+/gtk-2-24] Deprecate the old combobox text convenience api (cherry picked from commit 43250e8faf2cc008b0b829351

[Matthias Clasen <matthiasc src gnome org>]

commit f76c62929af71829ded1b6ffc396b0701abf175d
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Oct 15 16:33:11 2010 -0400

    Deprecate the old combobox text convenience api
    (cherry picked from commit 43250e8faf2cc008b0b829351efff651b680a85c)

 gtk/gtkcombobox.c |   12 ++++++++++++
 gtk/gtkcombobox.h |    4 ++++
 2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 85ebb96..6a4c020 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -5305,6 +5305,8 @@ gtk_combo_box_get_model (GtkComboBox *combo_box)
  * Return value: (transfer none): A new text combo box.
  *
  * Since: 2.4
+ *
+ * Deprecated: 2.24: Use #GtkComboBoxText
  */
 GtkWidget *
 gtk_combo_box_new_text (void)
@@ -5336,6 +5338,8 @@ gtk_combo_box_new_text (void)
  * gtk_combo_box_new_text().
  *
  * Since: 2.4
+ *
+ * Deprecated: 2.24: Use #GtkComboBoxText
  */
 void
 gtk_combo_box_append_text (GtkComboBox *combo_box,
@@ -5367,6 +5371,8 @@ gtk_combo_box_append_text (GtkComboBox *combo_box,
  * with gtk_combo_box_new_text().
  *
  * Since: 2.4
+ *
+ * Deprecated: 2.24: Use #GtkComboBoxText
  */
 void
 gtk_combo_box_insert_text (GtkComboBox *combo_box,
@@ -5399,6 +5405,8 @@ gtk_combo_box_insert_text (GtkComboBox *combo_box,
  * gtk_combo_box_new_text().
  *
  * Since: 2.4
+ *
+ * Deprecated: 2.24: Use #GtkComboBoxText
  */
 void
 gtk_combo_box_prepend_text (GtkComboBox *combo_box,
@@ -5428,6 +5436,8 @@ gtk_combo_box_prepend_text (GtkComboBox *combo_box,
  * this function with combo boxes constructed with gtk_combo_box_new_text().
  *
  * Since: 2.4
+ *
+ * Deprecated: 2.24: Use #GtkComboBoxText
  */
 void
 gtk_combo_box_remove_text (GtkComboBox *combo_box,
@@ -5460,6 +5470,8 @@ gtk_combo_box_remove_text (GtkComboBox *combo_box,
  *     Must be freed with g_free().
  *
  * Since: 2.6
+ *
+ * Deprecated: 2.24: Use #GtkComboBoxText
  */
 gchar *
 gtk_combo_box_get_active_text (GtkComboBox *combo_box)
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 831776d..dc6140b 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -124,6 +124,8 @@ void               gtk_combo_box_set_entry_text_column  (GtkComboBox        *com
 							 gint                text_column);
 gint               gtk_combo_box_get_entry_text_column  (GtkComboBox        *combo_box);
 
+#ifndef GTK_DISABLE_DEPRECATED
+
 /* convenience -- text */
 GtkWidget    *gtk_combo_box_new_text         (void);
 void          gtk_combo_box_append_text      (GtkComboBox     *combo_box,
@@ -137,6 +139,8 @@ void          gtk_combo_box_remove_text      (GtkComboBox     *combo_box,
                                               gint             position);
 gchar        *gtk_combo_box_get_active_text  (GtkComboBox     *combo_box);
 
+#endif
+
 /* programmatic control */
 void          gtk_combo_box_popup            (GtkComboBox     *combo_box);
 void          gtk_combo_box_popdown          (GtkComboBox     *combo_box);