X-Git-Url: http://git.roojs.org/?p=app.Builder.js;a=blobdiff_plain;f=XObject.js;h=05463b0d291ecc904b4f60290696dcd4a8f331ee;hp=b8d58483d8915e11fd2ee53b66719de94d1172a0;hb=refs%2Fheads%2Forigin.version_1_1;hpb=9ac1bb8e26d7374469062a4f50d4ffa7008ec8f4

diff --git a/XObject.js b/XObject.js
index b8d58483d..05463b0d2 100644
--- a/XObject.js
+++ b/XObject.js
@@ -65,32 +65,17 @@ function XObject (cfg) {
     // we could use this to determine if 
     // we are actually inside a inherited class...
     // as define() should actually set this up..
-    this.constructor = XObject;
     
-    
-    
-    // start by seeing if we have a base class....
-    try {
-        // loocks for XObject/Gtk/TreeView.js [   TreeView = { .... } ]
-        // xns is not a string!!!?
-        var gname = false;
-        if (typeof(cfg.xtype) == 'object') {
-            gname = GObject.type_name(cfg.xtype.type);
-           // print("GNAME:" +gname + " GTYPE:"+cfg.xtype.type);
-        }
+    if (!this.constructor) {
         
-        var base = gname  ? imports.XObjectBase[gname][gname] : false;
+        this.constructor = XObject;
+        var base = XObject.baseXObject(cfg);
         if (base) {
-          //  print("Overlaying XOBJBECT-BASE."  + cfg.xtype);
-            XObject.extend(this,base);
+            XObject.extend(this,base.prototype);
         }
         
-    } catch (e) {
-        // if debug?
-        XObject.log("error finding " + gname + " - " + e.toString());
     }
     
-    
     // copy down all elements into self..
     // make an extra copy in this.config?? - which is the one used in the constructor later
     
@@ -143,15 +128,14 @@ function XObject (cfg) {
     this.items = [];
     // create XObject for all the children.
     items.forEach(function(i,n) {
-         
-        var item = (i.constructor == XObject) ? o : new XObject(i);
+        var base = XObject.baseXObject(i);
+        base = base || XObject;
+        var item = (i.constructor == XObject) ? i : new base(i);
         item.parent = _this;
         _this.items.push(item);
         //_this.addItem(i);
     });
-    if (this.onConstruct) {
-        this.onConstruct.call(this);
-    }
+     
     
 }
 
@@ -728,10 +712,10 @@ XObject.extend(XObject,
         return ret;
     },
     /**
-     * return the Gobject name of a constructor
+     * return the Gobject name of a constructor - does not appear to work on structs..
      * @param {Object} gobject ctr
      * @return {String} returns name
-     * @member XObject keys
+     * @member XObject type
      */
     type : function(o)
     {
@@ -741,6 +725,38 @@ XObject.extend(XObject,
         }
         return 'unknown';
     },
+    /**
+     * return the XObjectBase class for a cfg (which includes an xtype)
+     * @param {Object} configuration.
+     * @return {function} constructor
+     * @member XObject baseXObject
+     */
+    baseXObject : function(cfg)
+    {
+          try {
+            // loocks for XObject/Gtk/TreeView.js [   TreeView = { .... } ]
+            // xns is not a string!!!?
+            var gname = false;
+            if (typeof(cfg.xtype) == 'object') {
+                gname = XObject.type(cfg.xtype);
+            
+            }
+            print("TRYING BASE OBJECT : " + gname);
+            // in the situation where we have been called and there is a base object
+            // defining the behavior..
+            // then we should copy the prototypes from the base object into this..
+            var base = gname  ? imports.XObjectBase[gname][gname] : false;
+            return base;
+            
+        } catch (e) {
+            // if debug?
+            XObject.log("error finding " + gname + " - " + e.toString());
+            return false;
+        }
+        
+        
+    },
+    
     /**
      * @member XObject createDelegate
      * creates a delage metdhod