X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=tools%2Fbuild_gtk_tree.js;h=8a40121b586faab3fa9835c4834edcbb7cca8054;hb=423f5026d89ba50b17121ea04aca7de4478c487b;hp=4b00fd81837edd83be9d3439128b4369ecba4633;hpb=f404e3e1e20406d50b1cdb4b6e4d1625e58a4a45;p=app.Builder.js

diff --git a/tools/build_gtk_tree.js b/tools/build_gtk_tree.js
index 4b00fd818..8a40121b5 100644
--- a/tools/build_gtk_tree.js
+++ b/tools/build_gtk_tree.js
@@ -90,6 +90,7 @@ function BuildLists () {
             //titleType : odata.titleType,
             extendsClasses : [],
             can_contain : [],
+            can_contain_using: [],
           //  can_be_added_to : [],
             //using_methods : { },
             can_be_added_to_as : {}
@@ -144,7 +145,9 @@ function BuildLists () {
                 //}
                 
                 methods[cls].can_contain.pushUnique(addable_type);
-                
+                var add = m.memberOf +':'+ m.name;
+ 
+                methods[cls].can_contain_methods.pushUnique(add);
                 //methods[cls].using_methods[m.name] = m.params;
                 
                 //if (methods[addable_type].can_be_added_to.indexOf(cls) < 0) { 
@@ -152,7 +155,6 @@ function BuildLists () {
                 //}
                 
                 
-                var add = m.memberOf +':'+ m.name;
                 
                 if (typeof(methods[addable_type].can_be_added_to_as[cls]) == 'undefined') {
                     methods[addable_type].can_be_added_to_as[cls]=[];
@@ -282,27 +284,63 @@ right:
     usage = {};
     tops = {}
     usage['*top'] = implementations['Gtk.Container'];
-    usage['*top'].forEach(function(ch)) {
+    usage['*top'].forEach(function(ch) {
         tops[ch] = [ '*top' ];
     });
     for(var cls in methods) {
+        if (cls =='Gtk.Builder') {
+            continue;
+        }
         for (var par in methods[cls].can_be_added_to_as) {
+            
             if (typeof(usage[par]) == 'undefined') {
                 usage[par] = [];
             }
             usage[par].pushUnique(cls);
-            
+            if (typeof(tops[cls]) == 'undefined') {
+                tops[cls] = [];
+            }
+            tops[cls].pushUnique(par);
         }
     }
+    function canTop(cls, rec) {
+        
+        rec = rec || 0;
+        //print('CANTOP: ' + cls + ' =' + rec);
+        if (rec > 5) {
+       //     print('SKIP : ' + cls);
+        }
+        if (typeof(tops[cls]) == 'undefined') {
+            return false;
+        }
+        for (var i =0; i < tops[cls].length; i++) {
+            if (tops[cls][i] == '*top') {
+                return true;
+            }
+            if (cls == tops[cls][i]) {
+                continue;
+            }
+            if (canTop(tops[cls][i], rec+1)) {
+                return true;
+            }
+        }
+        return false;
+        
+    }
+    var nusage = {};
     for(var par in usage) {
         // see if the parent can be added to something.
-        
+        if (!canTop(par)) {
+            continue;
+        }
+        nusage[par] = usage[par];
         
     }
     
-    print(JSON.stringify(usage,null,4));
-    
+    print(JSON.stringify(nusage,null,4));
     
+    print(JSON.stringify(methods['Gtk.Switch'],null,4));
+
     
     
     //print(JSON.stringify(implementations ,null,4));