[glade3/glade-3-8] * plugins/gtk+/glade-gtk.c, plugins/gtk+/gtk+.xml.in: Fixed GtkComboBox to handle cell-layout ch

[Tristan Van Berkom <tvb src gnome org>]

commit 0c15328aea33334733e184a8e99d489198fdc506
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Thu Dec 16 17:26:08 2010 +0900

    	* plugins/gtk+/glade-gtk.c, plugins/gtk+/gtk+.xml.in: Fixed GtkComboBox to handle cell-layout
    	  children as well as the possible internal entry (fixes bug 581580).

 ChangeLog                |    3 ++
 plugins/gtk+/glade-gtk.c |   54 ++++++++++++++++++++++++++++++++++++++++-----
 plugins/gtk+/gtk+.xml.in |    2 +-
 3 files changed, 52 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1faf51d..c34263b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
 	  iter stamp before notifying row-inserted (old iters are invalid, the new iter persists),
 	  fixed leaked GtkTreePath when rows are inserted.
 
+	* plugins/gtk+/glade-gtk.c, plugins/gtk+/gtk+.xml.in: Fixed GtkComboBox to handle cell-layout
+	  children as well as the possible internal entry (fixes bug 581580).
+
 2010-12-15  Tristan Van Berkom <tristanvb openismus com>
 
 	* gladeui/glade-project.c: Cleanup glade_project_remove_object(), make sure row_deleted is
diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c
index a1df066..60ca6a6 100644
--- a/plugins/gtk+/glade-gtk.c
+++ b/plugins/gtk+/glade-gtk.c
@@ -8935,7 +8935,25 @@ glade_gtk_combo_box_set_property (GladeWidgetAdaptor *adaptor,
 								  id, value);
 }
 
+GList *glade_gtk_cell_layout_get_children (GladeWidgetAdaptor  *adaptor, GObject  *container);
 
+GList *
+glade_gtk_combo_box_get_children (GladeWidgetAdaptor *adaptor, GtkComboBox *combo)
+{
+	GList *list = NULL;
+
+	list = glade_gtk_cell_layout_get_children (adaptor, G_OBJECT (combo));
+
+	/* return the internal entry.
+	 *
+	 * FIXME: for recent gtk+ we have no comboboxentry
+	 * but a "has-entry" property instead
+	 */
+	if (GTK_IS_COMBO_BOX_ENTRY (combo))
+		list = g_list_append (list, gtk_bin_get_child (GTK_BIN (combo)));
+
+	return list;
+}
 
 /* ----------------------------- GtkComboBoxEntry ------------------------------ */
 void
@@ -11195,7 +11213,7 @@ glade_gtk_cell_layout_remove_child (GladeWidgetAdaptor *adaptor,
 
 GList *
 glade_gtk_cell_layout_get_children (GladeWidgetAdaptor  *adaptor,
-				    GObject        *container)
+				    GObject             *container)
 {
 	return gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (container));
 }
@@ -11295,25 +11313,43 @@ glade_gtk_cell_layout_read_child (GladeWidgetAdaptor *adaptor,
 {
 	GladeXmlNode *widget_node;
 	GladeWidget  *child_widget;
+	gchar        *internal_name;
 
 	if (!glade_xml_node_verify (node, GLADE_XML_TAG_CHILD))
 		return;
+
+	internal_name = glade_xml_get_property_string (node, GLADE_XML_TAG_INTERNAL_CHILD);
 	
 	if ((widget_node = 
 	     glade_xml_search_child
 	     (node, GLADE_XML_TAG_WIDGET(glade_project_get_format(widget->project)))) != NULL)
 	{
+
+		if (internal_name)
+			g_warning ("Cell layout reading internal %s\n", internal_name);
+
+		/* Combo box is a special brand of cell-layout, it can also have the internal entry */
 		if ((child_widget = glade_widget_read (widget->project, 
 						       widget, widget_node, 
-						       NULL)) != NULL)
+						       internal_name)) != NULL)
 		{
-			glade_widget_add_child (widget, child_widget, FALSE);
+			/* Dont set any packing properties on internal children here,
+			 * its possible but just not relevant for known celllayouts...
+			 * i.e. maybe GtkTreeViewColumn will expose the internal button ?
+			 * but no need for packing properties there either.
+			 */
+			if (!internal_name)
+			{
+				glade_widget_add_child (widget, child_widget, FALSE);
 
-			glade_gtk_cell_renderer_read_attributes (child_widget, node);
+				glade_gtk_cell_renderer_read_attributes (child_widget, node);
 
-			g_idle_add ((GSourceFunc)glade_gtk_cell_renderer_sync_attributes, child_widget->object);
+				g_idle_add ((GSourceFunc)glade_gtk_cell_renderer_sync_attributes, 
+					    child_widget->object);
+			}
 		}
-	}
+	}	
+	g_free (internal_name);
 }
 
 static void
@@ -11378,6 +11414,12 @@ glade_gtk_cell_layout_write_child (GladeWidgetAdaptor *adaptor,
 	child_node = glade_xml_node_new (context, GLADE_XML_TAG_CHILD);
 	glade_xml_node_append_child (node, child_node);
 
+	/* ComboBox can have an internal entry */
+	if (widget->internal)
+		glade_xml_node_set_property_string (child_node, 
+						    GLADE_XML_TAG_INTERNAL_CHILD, 
+						    widget->internal);
+
 	/* Write out the widget */
 	glade_widget_write (widget, context, child_node);
 
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index 9599ab5..365b253 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -1105,7 +1105,7 @@ embedded in another object</_tooltip>
       <set-property-function>glade_gtk_combo_box_set_property</set-property-function>
       <add-child-function>glade_gtk_cell_layout_add_child</add-child-function>
       <remove-child-function>glade_gtk_cell_layout_remove_child</remove-child-function> 
-      <get-children-function>glade_gtk_cell_layout_get_children</get-children-function>
+      <get-children-function>glade_gtk_combo_box_get_children</get-children-function>
       <read-child-function>glade_gtk_cell_layout_read_child</read-child-function>
       <write-child-function>glade_gtk_cell_layout_write_child</write-child-function>
       <action-activate-function>glade_gtk_cell_layout_action_activate_as_widget</action-activate-function>