From: Alan Knowles <alan@roojs.com>
Date: Mon, 15 Sep 2014 11:14:53 +0000 (+0800)
Subject: Builder4/GtkView.bjs.6AP5LX
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=54f9382e8941364b917aad2a32787b405527065d;p=app.Builder.js

Builder4/GtkView.bjs.6AP5LX
Builder4/GtkView.bjs
Builder4/GtkView.js.CXT5LX
Builder4/GtkView.js
Builder4/GtkView.vala.VRR5LX
Builder4/GtkView.vala
---

diff --git a/Builder4/GtkView.bjs b/Builder4/GtkView.bjs
index 0ae4dd0ee..34248b2a7 100644
--- a/Builder4/GtkView.bjs
+++ b/Builder4/GtkView.bjs
@@ -11,7 +11,7 @@
             "# Gtk.Widget lastObj" : "null",
             "xtype" : "Viewport",
             "$ xns" : "Gtk",
-            "| void addNode" : "(JsRender.JsRender file) \n{\n    \n \n\n        if (file.tree == null) {\n            return;\n        }\n        if (this.lastObj != null) {\n            this.container.el.remove(this.lastObj);\n        }\n \n\tvar x = new JsRender.NodeToGtk(file.tree,  \"\");\n\tvar str = x.munge();\n\tif (str.length < 1) {\n        \treturn;\n\t}\n\tprint(\"%s\\n\",str);\n\tGLib.FileUtils.set_contents(\"/tmp/test-gtkview.glade\", str);\n        var builder = new Gtk.Builder.from_string (str,str.length);\n        var objs = builder.get_objects();\n\t//var obj = objs.nth_data(objs.length()-1) as Gtk.Widget;\n\tvar obj=  builder.get_object(\"fake-window1\") as Gtk.Widget;\n\t//var obj=  builder.get_object(file.tree.uid()) as Gtk.Widget;\n\tthis.lastObj = obj;\n        this.container.el.add(obj);\n}\n",
+            "| void addNode" : "(JsRender.JsRender file) \n{\n    \n \n\n        if (file.tree == null) {\n            return;\n        }\n        if (this.lastObj != null) {\n            this.container.el.remove(this.lastObj);\n        }\n \n\tvar x = new JsRender.NodeToGtk(file.tree);\n        var obj = g.munge() as Gtk.Widget;\n        this.lastObj = null;\n\tif (obj == null) {\n        \treturn;\n\t}\n\tthis.lastObj = obj;\n\tthis.lastObj = obj;\n        this.container.el.add(obj);\n}\n",
             "items" : [
                 {
                     "id" : "container",
diff --git a/Builder4/GtkView.js b/Builder4/GtkView.js
index 17926f202..b36e1eb57 100644
--- a/Builder4/GtkView.js
+++ b/Builder4/GtkView.js
@@ -26,18 +26,13 @@ GtkView=new XObject({
                 this.container.el.remove(this.lastObj);
             }
      
-    	var x = new JsRender.NodeToGtk(file.tree,  "");
-    	var str = x.munge();
-    	if (str.length < 1) {
+    	var x = new JsRender.NodeToGtk(file.tree);
+            var obj = g.munge() as Gtk.Widget;
+            this.lastObj = null;
+    	if (obj == null) {
             	return;
     	}
-    	print("%s\n",str);
-    	GLib.FileUtils.set_contents("/tmp/test-gtkview.glade", str);
-            var builder = new Gtk.Builder.from_string (str,str.length);
-            var objs = builder.get_objects();
-    	//var obj = objs.nth_data(objs.length()-1) as Gtk.Widget;
-    	var obj=  builder.get_object("fake-window1") as Gtk.Widget;
-    	//var obj=  builder.get_object(file.tree.uid()) as Gtk.Widget;
+    	this.lastObj = obj;
     	this.lastObj = obj;
             this.container.el.add(obj);
     },
diff --git a/Builder4/GtkView.vala b/Builder4/GtkView.vala
index 82e0c522d..0a8f2a9d8 100644
--- a/Builder4/GtkView.vala
+++ b/Builder4/GtkView.vala
@@ -45,18 +45,13 @@ public class Xcls_GtkView : Object
                 this.container.el.remove(this.lastObj);
             }
      
-    	var x = new JsRender.NodeToGtk(file.tree,  "");
-    	var str = x.munge();
-    	if (str.length < 1) {
+    	var x = new JsRender.NodeToGtk(file.tree);
+            var obj = g.munge() as Gtk.Widget;
+            this.lastObj = null;
+    	if (obj == null) {
             	return;
     	}
-    	print("%s\n",str);
-    	GLib.FileUtils.set_contents("/tmp/test-gtkview.glade", str);
-            var builder = new Gtk.Builder.from_string (str,str.length);
-            var objs = builder.get_objects();
-    	//var obj = objs.nth_data(objs.length()-1) as Gtk.Widget;
-    	var obj=  builder.get_object("fake-window1") as Gtk.Widget;
-    	//var obj=  builder.get_object(file.tree.uid()) as Gtk.Widget;
+    	this.lastObj = obj;
     	this.lastObj = obj;
             this.container.el.add(obj);
     }