[POS-commit] r201 - libglade

Johan Dahlin jdahlin at async.com.br
Thu Mar 24 15:52:50 BRT 2005


Author: jdahlin
Date: 2005-03-24 15:52:50 -0300 (Thu, 24 Mar 2005)
New Revision: 201

Modified:
   libglade/glade-xml.c
Log:
Kill GladeWidgetBuildData.new

Modified: libglade/glade-xml.c
===================================================================
--- libglade/glade-xml.c	2005-03-24 18:52:07 UTC (rev 200)
+++ libglade/glade-xml.c	2005-03-24 18:52:50 UTC (rev 201)
@@ -116,7 +116,6 @@
 
 typedef struct _GladeWidgetBuildData GladeWidgetBuildData;
 struct _GladeWidgetBuildData {
-    GladeNewFunc new;
     GladeBuildChildrenFunc build_children;
     GladeFindInternalChildFunc find_internal_child;
 };
@@ -1273,11 +1272,7 @@
     if (glade_build_data_id == 0)
 	glade_build_data_id = g_quark_from_static_string(glade_build_data_key);
 
-    if (!new_func) new_func = glade_standard_build_widget;
-
     data = g_new(GladeWidgetBuildData, 1);
-
-    data->new = new_func;
     data->build_children = build_children;
     data->find_internal_child = find_internal_child;
 
@@ -1293,12 +1288,10 @@
 get_build_data(GType type)
 {
     static const GladeWidgetBuildData widget_build_data = {
-	glade_standard_build_widget,
 	NULL,
 	NULL
     };
     static const GladeWidgetBuildData container_build_data = {
-	glade_standard_build_widget,
 	glade_standard_build_children,
 	NULL
     };
@@ -1890,8 +1883,8 @@
 	    g_snprintf(buf, 49, "[a %s]", info->classname);
 	    ret = gtk_label_new(buf);
 	} else {
-	    g_print("->new(%s)\n", g_type_name(type));
-	    ret = get_build_data(type)->new(self, type, info);
+	    g_print("glade_standard_build_widget(..., %s, ...)\n", g_type_name(type));
+	    ret = glade_standard_build_widget(self, type, info);
 	}
     }
 



More information about the POS-commit mailing list