X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=tools%2Fbuild_gtk_tree.js;h=a46b8fb3371388bfb118d270db4eedbb2ffc3f8b;hb=02aad0a43b8f2f82c43a028ff14f7f22d475df0c;hp=526fa59f49f18b0797844aace0fbbd33854e16f8;hpb=e06c1cf8c9a2c679eef536271e5478c3fa6406c8;p=app.Builder.js

diff --git a/tools/build_gtk_tree.js b/tools/build_gtk_tree.js
index 526fa59f4..a46b8fb33 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 : {}
@@ -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] = [];
             }
@@ -300,9 +310,9 @@ right:
     function canTop(cls, rec) {
         
         rec = rec || 0;
-        print('CANTOP: ' + cls + ' =' + rec);
+        //print('CANTOP: ' + cls + ' =' + rec);
         if (rec > 5) {
-            print('SKIP : ' + cls);
+       //     print('SKIP : ' + cls);
         }
         if (typeof(tops[cls]) == 'undefined') {
             return false;
@@ -314,7 +324,7 @@ right:
             if (cls == tops[cls][i]) {
                 continue;
             }
-            if (canTop(cls, rec+1)) {
+            if (canTop(tops[cls][i], rec+1)) {
                 return true;
             }
         }
@@ -333,7 +343,8 @@ right:
     
     print(JSON.stringify(nusage,null,4));
     
-    
+    print(JSON.stringify(methods['Gtk.Switch'],null,4));
+
     
     
     //print(JSON.stringify(implementations ,null,4));