X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=tools%2Fbuild_gtk_tree.js;h=23800b26d5cac8cb96a089947e12e18e8b7f0ca5;hb=8de2bab7499488557634372c3d8084c4e8791a23;hp=e404023238d20fbff50b84e618e008a5152b3147;hpb=1d5c57bd4e63de8e28f327a7f836d5ff6964ab09;p=app.Builder.js

diff --git a/tools/build_gtk_tree.js b/tools/build_gtk_tree.js
index e40402323..23800b26d 100644
--- a/tools/build_gtk_tree.js
+++ b/tools/build_gtk_tree.js
@@ -48,7 +48,7 @@ function BuildLists () {
     
  
 
-    var ns_list = [ 'Gtk' , 'Gdk', 'Pango', 'GtkSource', 'WebKit', 'Vte'] ; //NameSpace.namespaces();
+    var ns_list = [ 'Gtk' , 'Gdk', 'Pango', 'GtkSource', 'WebKit', 'Vte', 'GtkClutter'] ; //NameSpace.namespaces();
      
     ns_list = ns_list.sort();
     // let's try and load them, so we find out early what will fail.
@@ -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 : {}
@@ -129,8 +130,12 @@ function BuildLists () {
                     addable_type = p.memberOf + '.' + p.type;
                 }
                 
-                
-               
+                if (m.memberOf == 'Gtk.Buildable') {
+                    return;
+                }
+                if (m.name =='add_mnemonic_label') {
+                    return;
+                }
                 // in theory you can not add a window to anything.. ???
                 //if ('Gtk.Window' == addable_type || methods[addable_type].extendsClasses.indexOf('Gtk.Window') > -1) {
                 //    return;
@@ -144,7 +149,9 @@ function BuildLists () {
                 //}
                 
                 methods[cls].can_contain.pushUnique(addable_type);
-                
+                var add = m.memberOf +':'+ m.name;
+ 
+                methods[cls].can_contain_using.pushUnique(add);
                 //methods[cls].using_methods[m.name] = m.params;
                 
                 //if (methods[addable_type].can_be_added_to.indexOf(cls) < 0) { 
@@ -152,7 +159,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]=[];
@@ -286,7 +292,11 @@ right:
         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] = [];
             }
@@ -297,7 +307,16 @@ right:
             tops[cls].pushUnique(par);
         }
     }
-    function canTop(cls) {
+    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;
@@ -305,7 +324,7 @@ right:
             if (cls == tops[cls][i]) {
                 continue;
             }
-            if (canTop(cls)) {
+            if (canTop(tops[cls][i], rec+1)) {
                 return true;
             }
         }
@@ -313,18 +332,31 @@ right:
         
     }
     var nusage = {};
+	var usage_left = {};
     for(var par in usage) {
         // see if the parent can be added to something.
         if (!canTop(par)) {
             continue;
         }
+		
+		for(var dupe in usage) {
+			if (usage[par].join(',') == usage[dupe].join(',') &&
+				typeof(nusage[par]) != 'undefined') {
+				usage_left[par] = dupe;
+				break;
+			}
+		}
+		if (typeof(usage_left[par]) != 'undefined') {
+			continue;
+		}
         nusage[par] = usage[par];
         
     }
     
     print(JSON.stringify(nusage,null,4));
     
-    
+    print(JSON.stringify(methods['Gtk.Switch'],null,4));
+
     
     
     //print(JSON.stringify(implementations ,null,4));