tools/build_gtk_tree.js

[app.Builder.js] / tools / build_gtk_tree.js

diff --git a/tools/build_gtk_tree.js b/tools/build_gtk_tree.js
index 9ba21a2..f3e1042 100644 (file)
--- 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]=[];
@@ -326,11 +332,21 @@ 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(',')) {
+                               usage_left[par] = dupe;
+                       }
+               }
+               if (typeof(usage_left[par]) != 'undefined') {
+                       continue;
+               }
         nusage[par] = usage[par];
         
     }