diff options
| author | Paul Pogonyshev <paulp@src.gnome.org> | 2008-07-06 22:26:56 +0000 |
|---|---|---|
| committer | Paul Pogonyshev <paulp@src.gnome.org> | 2008-07-06 22:26:56 +0000 |
| commit | de5fc9884233fab85722c0a5edd322942d8a44e0 (patch) | |
| tree | 5ad106e0043fd117b92ac1159be60e4e7fdef303 /gtk/gtkcomboboxentry.c | |
| parent | bb396a07b29016fcfa40e689f47461fa5086b62b (diff) | |
| download | gtk+-de5fc9884233fab85722c0a5edd322942d8a44e0.tar.gz | |
Revert some accidentally committed changes.
svn path=/trunk/; revision=20793
Diffstat (limited to 'gtk/gtkcomboboxentry.c')
| -rw-r--r-- | gtk/gtkcomboboxentry.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/gtk/gtkcomboboxentry.c b/gtk/gtkcomboboxentry.c index 9d76e4e94d..fe77f52bf5 100644 --- a/gtk/gtkcomboboxentry.c +++ b/gtk/gtkcomboboxentry.c @@ -50,7 +50,6 @@ static void gtk_combo_box_entry_add (GtkContainer *contain GtkWidget *child); static void gtk_combo_box_entry_remove (GtkContainer *container, GtkWidget *child); -static GType gtk_combo_box_entry_child_type (GtkContainer *container); static gchar *gtk_combo_box_entry_get_active_text (GtkComboBox *combo_box); static void gtk_combo_box_entry_active_changed (GtkComboBox *combo_box, @@ -97,7 +96,6 @@ gtk_combo_box_entry_class_init (GtkComboBoxEntryClass *klass) container_class = (GtkContainerClass *)klass; container_class->add = gtk_combo_box_entry_add; container_class->remove = gtk_combo_box_entry_remove; - container_class->child_type = gtk_combo_box_entry_child_type; combo_class = (GtkComboBoxClass *)klass; combo_class->get_active_text = gtk_combo_box_entry_get_active_text; @@ -238,16 +236,6 @@ gtk_combo_box_entry_remove (GtkContainer *container, GTK_CONTAINER_CLASS (gtk_combo_box_entry_parent_class)->remove (container, child); } -static GType -gtk_combo_box_entry_child_type (GtkContainer *container) -{ - if (!GTK_BIN (container)->child) - return GTK_TYPE_ENTRY; - else - return G_TYPE_NONE; -} - - static void gtk_combo_box_entry_active_changed (GtkComboBox *combo_box, gpointer user_data) |