summaryrefslogtreecommitdiff
path: root/gtk/gtkcombobox.h
diff options
context:
space:
mode:
authorTristan Van Berkom <tristanvb@openismus.com>2010-10-13 21:52:27 -0400
committerMatthias Clasen <mclasen@redhat.com>2010-10-13 21:52:27 -0400
commit9612c648176378bf237ad0e1a8c6c995b0ca7c61 (patch)
tree875a7b2a6ce93657d756b2bae1a3c5ae07a75574 /gtk/gtkcombobox.h
parent7c8ee80c5af0909735d1e36b8aba7aa02bf83c95 (diff)
downloadgtk+-9612c648176378bf237ad0e1a8c6c995b0ca7c61.tar.gz
Deprecate GtkComboBoxEntry in favor of added properties to GtkComboBox
GtkComboBox now sports a construct-only "has-entry" property which decides if it uses a GtkEntry to allow additional user input. Also it has a new "entry-text-column" to fetch strings for the entry from the model. This patch deprecates the GtkComboBoxEntry and updates the rest of GTK+ to use the new semantics on GtkComboBox instead. GtkComboBoxEntry will be removed altogether before GTK+ 3, in a later commit.
Diffstat (limited to 'gtk/gtkcombobox.h')
-rw-r--r--gtk/gtkcombobox.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 84f54755b5..0ece10f7da 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -69,6 +69,7 @@ struct _GtkComboBoxClass
/* construction */
GType gtk_combo_box_get_type (void) G_GNUC_CONST;
GtkWidget *gtk_combo_box_new (void);
+GtkWidget *gtk_combo_box_new_with_entry (void);
GtkWidget *gtk_combo_box_new_with_model (GtkTreeModel *model);
/* grids */
@@ -118,6 +119,11 @@ void gtk_combo_box_set_button_sensitivity (GtkComboBox *com
GtkSensitivityType sensitivity);
GtkSensitivityType gtk_combo_box_get_button_sensitivity (GtkComboBox *combo_box);
+gboolean gtk_combo_box_get_has_entry (GtkComboBox *combo_box);
+void gtk_combo_box_set_entry_text_column (GtkComboBox *combo_box,
+ gint text_column);
+gint gtk_combo_box_get_entry_text_column (GtkComboBox *combo_box);
+
/* convenience -- text */
GtkWidget *gtk_combo_box_new_text (void);
void gtk_combo_box_append_text (GtkComboBox *combo_box,