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 0d4a9aa..ee5d726 100644 (file)
--- a/tools/build_gtk_tree.js
+++ b/tools/build_gtk_tree.js
@@ -133,9 +133,13 @@ function BuildLists () {
                 if (m.memberOf == 'Gtk.Buildable') {
                     return;
                 }
-                if (m.name =='add_mnemonic_label') {
+                               //"Gtk.Widget:add_accelerator",
+                               //"Gtk.Widget:add_device_events"
+
+                if (m.name.match(/^(add_mnemonic_label|add_accelerator|add_device_events)$/)) {
                     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;
@@ -338,37 +342,43 @@ right:
         if (!canTop(par)) {
             continue;
         }
-               var duped = true;
+               var duped = false;
                for(var dupe in usage) {
-                       if (usage[par].join(',') == usage[dupe].join(',') &&
-                               typeof(nusage[par]) != 'undefined') {
+                       if (par != dupe
+                               && typeof(nusage[dupe]) != 'undefined'
+                               && usage[par].join(',') == usage[dupe].join(',')) {
                                duped = true;
-                               if (usage_left[dupe] == 'undefined') {
+                               
+                               if (typeof(usage_left[dupe]) == 'undefined') {
                                        usage_left[dupe] = []; 
                                }
+                               //print(par+ ' is a dupe of ' + dupe);
                                usage_left[dupe].pushUnique(par);
                                break;
                        }
                }
-               if (typeof(usage_left[par]) != 'undefined') {
-                       continue;
-               }
+                if (duped) {
+                       continue;
+                }
         nusage[par] = usage[par];
         
     }
-    
-    print(JSON.stringify(nusage,null,4));
-    
-    print(JSON.stringify(methods['Gtk.Switch'],null,4));
+    usage = nusage;
+    //print(JSON.stringify(nusage,null,4));  Seed.exit();
+    print(JSON.stringify(methods['Gtk.TextView'],null,4));
 
-    var str = '';
+    var str = [];
        for(var par in usage) {
                str.push('left');
                str.push('   ' + par);
                if (typeof(usage_left[par]) != 'undefined') {
-                       
+                       usage_left[par].forEach(function(d) { str.push('    ' + d);});
                }
-    
+               str.push('right');
+               usage[par].forEach(function(d) { str.push('    ' + d);});
+               str.push('');
+       }
+       print(str.join("\n"));
     //print(JSON.stringify(implementations ,null,4));
     /*
       methods is