X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=tools%2Fbuild_gtk_tree.js;h=f6a8479353dd0337833748c4077e4e1d54788535;hb=2ac566756ac2af019cc0d8c5e99b34d649519c74;hp=1dd0a3b3d15bd4d9b093fd57f2c997b499920a8b;hpb=cbeb259811139fd59685159d24d967222fc9f2fe;p=app.Builder.js

diff --git a/tools/build_gtk_tree.js b/tools/build_gtk_tree.js
index 1dd0a3b3d..f6a847935 100644
--- a/tools/build_gtk_tree.js
+++ b/tools/build_gtk_tree.js
@@ -276,10 +276,49 @@ function BuildLists () {
         if (method !='Gtk.Container:add') {
             return true;
         }
-        var cls = parent.split('.').pop();
-        var x = new Gtk[cls]();
-        print(parent + " : says children are of type : " + x.child_type());
-        return true;
+        if (failed.indexOf(parent) > -1) {
+            return false;
+        }
+        
+        var ar =  parent.split('.')
+        var cls =ar[1];
+        var ns =ar[0];
+         
+        /*
+        if (parent == 'Gtk.Bin' || methods['Gtk.Bin'].extendsClasses.indexOf(parent) > -1) {
+            return false;
+        }
+        if (['GtkSource.CompletionInfo',
+             'Gtk.MenuShell',
+             'GtkSource.View', // ??? nothing can be added to it?
+             'WebKit.WebView', // ??? nothing can be added to it?
+             'GtkClutter.Embed'
+             ].indexOf(parent) > -1) {
+             return false;
+        }
+        */
+        
+        
+        try {
+            var x = new imports.gi[ns][cls]();
+        } catch(e) {
+            failed.push(parent);
+            print("TRY ctor:  " + parent );
+            print(JSON.stringify(e));
+            return false;
+        }
+        
+        //print("TRY child type:  " + parent);
+        var ct = x.child_type();
+        //print(parent + " : says children are of type : " + ct);
+        // get the Gtype for the child?
+        var GObject = imports.gi.GObject;
+        var match = GObject.type_from_name(ar.join(''));
+        //print([match, ct]);
+        //print ("matching?" + (GObject.type_is_a(match,  ct ) ? "YES" : "NO"));
+        
+        
+        return GObject.type_is_a(match,  ct )  ? true : false;
         
     }
     
@@ -290,14 +329,14 @@ function BuildLists () {
     function verifyUsage(parent,child)
     {
         // find all the methods that child can be added to parent.
-        var methods = methods[parent].can_contain_using;
-        for(var i =0;i<methods.length;i++) {
-            var m = methods[i].split(':');
+        var mts = methods[parent].can_contain_using;
+        for(var i =0;i<mts.length;i++) {
+            var m = mts[i].split(':');
             if (!is_a(child,m[0])) {
                 continue;
                 
             }
-            if (verifyUsageMethod(parent,child,methods[i])) {
+            if (verifyUsageMethod(parent,child,mts[i])) {
                 return true;
             }
         }
@@ -342,13 +381,15 @@ right:
         }
         for (var par in methods[cls].can_be_added_to_as) {
             
+            if (!verifyUsage(par,cls)) {
+                continue;
+            }
+            
             if (typeof(usage[par]) == 'undefined') {
                 usage[par] = [];
             }
             
-            if (!verifyUsage(par,cls)) {
-                continue;
-            }
+           
             
             usage[par].pushUnique(cls);
             if (typeof(tops[cls]) == 'undefined') {
@@ -357,6 +398,8 @@ right:
             tops[cls].pushUnique(par);
         }
     }
+    
+    
     function canTop(cls, rec) {
         
         rec = rec || 0;
@@ -379,8 +422,22 @@ right:
             }
         }
         return false;
-        
     }
+    var lefts = {};
+    for(var par in usage) {
+        var left = usage[par].join(',');
+        if (typeof(lefts[left]) == 'undefined') {
+            lefts[left] = [];
+        }
+        lefts[left].push(par);
+    }
+    print (JSON.stringify(lefts,null,4));
+    Seed.exit();
+        
+        
+        
+        
+    print (JSON.stringify(usage,null,4));
     var nusage = {};
 	var usage_left = {};
     for(var par in usage) {
@@ -429,7 +486,7 @@ right:
     /*
       methods is
         [a class]
-            [has methods that use this object]
+            [has  methods that use this object]
                 [list of methods of the top class..]
      
      
@@ -459,6 +516,9 @@ right:
     //print(JSON.stringify(implementations,null,4));
     
 }
+imports.gi.Gtk.init(Seed.argv);
+
+imports.gi.GtkClutter.init(Seed.argv);
 BuildLists();
 
 // we now have a list of classes / methods that can be used..