diff options
| author | Kristian Rietveld <kris@gtk.org> | 2003-11-16 23:20:15 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2003-11-16 23:20:15 +0000 |
| commit | d777b5b46a2baea0293cb7c474de5728cc0084c7 (patch) | |
| tree | 4a031deb54de143a8e675afd76b0239a3d9097be /gtk/gtkcombobox.h | |
| parent | 01d2e36671826c4aebda689c8c8e4de795be98d9 (diff) | |
| download | gtk+-d777b5b46a2baea0293cb7c474de5728cc0084c7.tar.gz | |
Fixes #124373, Murray Cumming.
Mon Nov 17 00:11:21 2003 Kristian Rietveld <kris@gtk.org>
Fixes #124373, Murray Cumming.
* gtk/gtkcombobox.[ch] (gtk_combo_box_class_init): the model property
is no longer construct only,
(gtk_combo_box_unset_model), (gtk_combo_box_set_model_internal),
(gtk_combo_box_menu_fill): new functions,
(gtk_combo_box_menu_setup), (gtk_combo_box_menu_destroy),
(gtk_combo_box_menu_row_*), (gtk_combo_box_list_setup),
(gtk_combo_box_list_destroy): updated,
(gtk_combo_box_new), (gtk_combo_box_new_with_model): new/changed
functions,
(gtk_combo_box_set_model): is now public, updated,
(gtk_combo_box_get_model): small update.
* gtk/gtkcomboboxentry.[ch] (gtk_combo_box_entry_class_init): the
text_column property is no longer construct only,
(gtk_combo_box_entry_set_text_column): now public,
(gtk_combo_box_entry_new), (gtk_combo_box_entry_new_with_model):
new/changed functions.
* tests/testcombo.c: updated.
Diffstat (limited to 'gtk/gtkcombobox.h')
| -rw-r--r-- | gtk/gtkcombobox.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h index a38e2c7721..891a6464d5 100644 --- a/gtk/gtkcombobox.h +++ b/gtk/gtkcombobox.h @@ -62,7 +62,8 @@ struct _GtkComboBoxClass /* construction */ GType gtk_combo_box_get_type (void); -GtkWidget *gtk_combo_box_new (GtkTreeModel *model); +GtkWidget *gtk_combo_box_new (void); +GtkWidget *gtk_combo_box_new_with_model (GtkTreeModel *model); /* grids */ void gtk_combo_box_set_wrap_width (GtkComboBox *combo_box, @@ -77,11 +78,13 @@ gint gtk_combo_box_get_active (GtkComboBox *combo_box); void gtk_combo_box_set_active (GtkComboBox *combo_box, gint index); gboolean gtk_combo_box_get_active_iter (GtkComboBox *combo_box, - GtkTreeIter *iter); + GtkTreeIter *iter); void gtk_combo_box_set_active_iter (GtkComboBox *combo_box, - GtkTreeIter *iter); + GtkTreeIter *iter); /* getters and setters */ +void gtk_combo_box_set_model (GtkComboBox *combo_box, + GtkTreeModel *model); GtkTreeModel *gtk_combo_box_get_model (GtkComboBox *combo_box); /* convenience -- text */ |