diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 8f72807c90..a649c0f652 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -5287,6 +5287,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) @@ -5318,6 +5320,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, @@ -5349,6 +5353,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, @@ -5381,6 +5387,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, @@ -5410,6 +5418,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, @@ -5442,6 +5452,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 0ece10f7da..42476b0572 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_popup_for_device (GtkComboBox *combo_box,