gtk+ r20793 - trunk/gtk
- From: paulp svn gnome org
- To: svn-commits-list gnome org
- Subject: gtk+ r20793 - trunk/gtk
- Date: Sun, 6 Jul 2008 22:26:57 +0000 (UTC)
Author: paulp
Date: Sun Jul 6 22:26:56 2008
New Revision: 20793
URL: http://svn.gnome.org/viewvc/gtk+?rev=20793&view=rev
Log:
Revert some accidentally committed changes.
Modified:
trunk/gtk/gtkcomboboxentry.c
Modified: trunk/gtk/gtkcomboboxentry.c
==============================================================================
--- trunk/gtk/gtkcomboboxentry.c (original)
+++ trunk/gtk/gtkcomboboxentry.c Sun Jul 6 22:26:56 2008
@@ -50,7 +50,6 @@
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 @@
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_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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]