diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-04-01 20:53:04 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-04-01 20:53:04 +0000 |
| commit | b82af5ce89d6cb5052730d9f701f247438103790 (patch) | |
| tree | c4880c0a74d554a5227026a5d1012aba4f8351c7 /gtk/gtkcomboboxentry.c | |
| parent | 6160b3ba8f1120af42016a55541882d61c4917d0 (diff) | |
| download | gtk+-b82af5ce89d6cb5052730d9f701f247438103790.tar.gz | |
Make gtk_combo_box_get_active_text do the right thing for GtkComboBoxEntry
2005-04-01 Matthias Clasen <mclasen@redhat.com>
Make gtk_combo_box_get_active_text do the right thing for
GtkComboBoxEntry (#171373, Robert Staudinger)
* gtk/gtkcombobox.h: Add a get_active_text vfunc.
* gtk/gtkcombobox.c (gtk_combo_box_real_get_active_text): And
implement it here.
* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_get_active_text):
Implement get_active_text by always returning the content of
the entry.
Diffstat (limited to 'gtk/gtkcomboboxentry.c')
| -rw-r--r-- | gtk/gtkcomboboxentry.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c index 3b2974e1ff..108605465d 100644 --- a/gtk/gtkcomboboxentry.c +++ b/gtk/gtkcomboboxentry.c @@ -50,6 +50,7 @@ static void gtk_combo_box_entry_get_property (GObject *object, GValue *value, GParamSpec *pspec); +static gchar *gtk_combo_box_entry_get_active_text (GtkComboBox *combo_box); static void gtk_combo_box_entry_active_changed (GtkComboBox *combo_box, gpointer user_data); static void gtk_combo_box_entry_contents_changed (GtkEntry *entry, @@ -101,7 +102,8 @@ gtk_combo_box_entry_class_init (GtkComboBoxEntryClass *klass) { GObjectClass *object_class; GtkWidgetClass *widget_class; - + GtkComboBoxClass *combo_class; + object_class = (GObjectClass *)klass; object_class->set_property = gtk_combo_box_entry_set_property; object_class->get_property = gtk_combo_box_entry_get_property; @@ -109,6 +111,9 @@ gtk_combo_box_entry_class_init (GtkComboBoxEntryClass *klass) widget_class = (GtkWidgetClass *)klass; widget_class->mnemonic_activate = gtk_combo_box_entry_mnemonic_activate; + combo_class = (GtkComboBoxClass *)klass; + combo_class->get_active_text = gtk_combo_box_entry_get_active_text; + g_object_class_install_property (object_class, PROP_TEXT_COLUMN, g_param_spec_int ("text-column", @@ -384,5 +389,16 @@ gtk_combo_box_entry_new_text (void) return entry_box; } +static gchar * +gtk_combo_box_entry_get_active_text (GtkComboBox *combo_box) +{ + GtkComboBoxEntry *combo = GTK_COMBO_BOX_ENTRY (combo_box); + + if (combo->priv->entry) + return g_strdup (gtk_entry_get_text (combo->priv->entry)); + + return NULL; +} + #define __GTK_COMBO_BOX_ENTRY_C__ #include "gtkaliasdef.c" |