X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=tools%2Fbuild_gtk_tree.js;h=586c85c871e16a13278ccb9009898dfd8d125f77;hb=1ed475e61ad41a7318adc091a446aaab57204816;hp=f3e10422dce8913cd95b21267321dce4071bb019;hpb=114e4cfd8f8962ea7fd095d9582aad98f31d384f;p=app.Builder.js

diff --git a/tools/build_gtk_tree.js b/tools/build_gtk_tree.js
index f3e10422d..586c85c87 100644
--- 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;
@@ -263,9 +267,49 @@ function BuildLists () {
     this.methods = methods;
     this.allmethods = methods;
     this.implementations = implementations;
-    //print(JSON.stringify(methods,null,4));
+    //print(JSON.stringify(methods,null,4)); Seed.exit();
     // dump out a usage file..
     
+    function verifyUsageMethod(parent,child,method)
+    {
+        // currently only verifies add on container.
+        if (method !='Gtk.Container:add') {
+            return true;
+        }
+        var cls = parent.split('.').pop();
+        var x = new Gtk[cls]();
+        print(parent + " : says children are of type : " + x.child_type());
+        
+    }
+    
+    function is_a(cls, instance_of) {
+        return methods[cls].extendsClasses.indexOf(instance_of) > -1; 
+    }
+    
+    function verifyUsage(parent,child)
+    {
+        // find all the methods that child can be added to parent.
+        var methods = methods[parent].can_contain_using;
+        for(var i =0;i<methods.length;i++) {
+            var m = methods[i].split(':');
+            if (!is_a(child,m[0])) {
+                continue;
+                
+            }
+            if (verifyUsageMethod(parent,child,methods[i])) {
+                return true;
+            }
+        }
+        return false;
+        
+        
+    }
+    
+    
+    
+    
+    
+    
     // basically anything that is a Gtk.Container, should be available at the top.
     /*
 left:
@@ -300,6 +344,11 @@ right:
             if (typeof(usage[par]) == 'undefined') {
                 usage[par] = [];
             }
+            
+            if (!verifyUsage(par,cls)) {
+                continue;
+            }
+            
             usage[par].pushUnique(cls);
             if (typeof(tops[cls]) == 'undefined') {
                 tops[cls] = [];
@@ -338,25 +387,43 @@ right:
         if (!canTop(par)) {
             continue;
         }
-		
+		var duped = false;
 		for(var dupe in usage) {
-			if (usage[par].join(',') == usage[dupe].join(',')) {
-				usage_left[par] = dupe;
+			if (par != dupe
+				&& typeof(nusage[dupe]) != 'undefined'
+				&& usage[par].join(',') == usage[dupe].join(',')) {
+				duped = true;
+				
+				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 = [];
+	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