callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecate the old combobox text convenience api

Browse Source
This commit is contained in:
Matthias Clasen 2010-10-15 16:33:11 -04:00
parent e7f51ef6a4
commit 43250e8faf
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkcombobox.c
View File

@ -5287,6 +5287,8 @@ gtk_combo_box_get_model (GtkComboBox *combo_box)
* Return value: (transfer none): A new text combo box. * Return value: (transfer none): A new text combo box.
* *
* Since: 2.4 * Since: 2.4
*
* Deprecated: 2.24: Use #GtkComboBoxText
*/ */
GtkWidget * GtkWidget *
gtk_combo_box_new_text (void) gtk_combo_box_new_text (void)
@ -5318,6 +5320,8 @@ gtk_combo_box_new_text (void)
* gtk_combo_box_new_text(). * gtk_combo_box_new_text().
* *
* Since: 2.4 * Since: 2.4
*
* Deprecated: 2.24: Use #GtkComboBoxText
*/ */
void void
gtk_combo_box_append_text (GtkComboBox *combo_box, 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(). * with gtk_combo_box_new_text().
* *
* Since: 2.4 * Since: 2.4
*
* Deprecated: 2.24: Use #GtkComboBoxText
*/ */
void void
gtk_combo_box_insert_text (GtkComboBox *combo_box, 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(). * gtk_combo_box_new_text().
* *
* Since: 2.4 * Since: 2.4
*
* Deprecated: 2.24: Use #GtkComboBoxText
*/ */
void void
gtk_combo_box_prepend_text (GtkComboBox *combo_box, 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(). * this function with combo boxes constructed with gtk_combo_box_new_text().
* *
* Since: 2.4 * Since: 2.4
*
* Deprecated: 2.24: Use #GtkComboBoxText
*/ */
void void
gtk_combo_box_remove_text (GtkComboBox *combo_box, 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(). * Must be freed with g_free().
* *
* Since: 2.6 * Since: 2.6
*
* Deprecated: 2.24: Use #GtkComboBoxText
*/ */
gchar * gchar *
gtk_combo_box_get_active_text (GtkComboBox *combo_box) gtk_combo_box_get_active_text (GtkComboBox *combo_box)

4
gtk/gtkcombobox.h
View File

@ -124,6 +124,8 @@ void gtk_combo_box_set_entry_text_column (GtkComboBox *com
gint text_column); gint text_column);
gint gtk_combo_box_get_entry_text_column (GtkComboBox *combo_box); gint gtk_combo_box_get_entry_text_column (GtkComboBox *combo_box);
#ifndef GTK_DISABLE_DEPRECATED
/* convenience -- text */ /* convenience -- text */
GtkWidget *gtk_combo_box_new_text (void); GtkWidget *gtk_combo_box_new_text (void);
void gtk_combo_box_append_text (GtkComboBox *combo_box, void gtk_combo_box_append_text (GtkComboBox *combo_box,
@ -137,6 +139,8 @@ void gtk_combo_box_remove_text (GtkComboBox *combo_box,
gint position); gint position);
gchar *gtk_combo_box_get_active_text (GtkComboBox *combo_box); gchar *gtk_combo_box_get_active_text (GtkComboBox *combo_box);
#endif
/* programmatic control */ /* programmatic control */
void gtk_combo_box_popup (GtkComboBox *combo_box); void gtk_combo_box_popup (GtkComboBox *combo_box);
void gtk_combo_box_popup_for_device (GtkComboBox *combo_box, void gtk_combo_box_popup_for_device (GtkComboBox *combo_box,