X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=tools%2Fbuild_gtk_tree.js;h=bc550cbea8f46ca152a5b2078a05029ee7d943f5;hb=058e948ea7076cbe927bbd87db0799700d2c0436;hp=817e211cca6d24e37e12d915c8b2371fcfc454a6;hpb=d8c3ed9106f83e48cb869a4c638a2eedc6816fed;p=app.Builder.js

diff --git a/tools/build_gtk_tree.js b/tools/build_gtk_tree.js
index 817e211cc..bc550cbea 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,73 @@ 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();
+         
+        /*
+        if (parent == 'Gtk.Bin' || methods['Gtk.Bin'].extendsClasses.indexOf(parent) > -1) {
+            return false;
+        }
+        if (['GtkSource.CompletionInfo',
+             'Gtk.MenuShell',
+             'GtkSource.View', // ??? nothing can be added to it?
+             'WebKit.WebView', // ??? nothing can be added to it?
+             'GtkClutter.Embed'
+             ].indexOf(parent) > -1) {
+             return false;
+        }
+        */
+        
+        //print("TRY ctor:  " + parent );
+
+        var x = new imports.gi.Gtk[cls]();
+        //print("TRY child type:  " + parent);
+        
+        print(parent + " : says children are of type : " + x.child_type());
+        // get the Gtype for the child?
+        
+        
+        return true;
+        
+    }
+    
+    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 mts = methods[parent].can_contain_using;
+        for(var i =0;i<mts.length;i++) {
+            var m = mts[i].split(':');
+            if (!is_a(child,m[0])) {
+                continue;
+                
+            }
+            if (verifyUsageMethod(parent,child,mts[i])) {
+                return true;
+            }
+        }
+        return false;
+        
+        
+    }
+    
+    
+    
+    
+    
+    
     // basically anything that is a Gtk.Container, should be available at the top.
     /*
 left:
@@ -297,9 +365,16 @@ right:
         }
         for (var par in methods[cls].can_be_added_to_as) {
             
+            if (!verifyUsage(par,cls)) {
+                continue;
+            }
+            
             if (typeof(usage[par]) == 'undefined') {
                 usage[par] = [];
             }
+            
+           
+            
             usage[par].pushUnique(cls);
             if (typeof(tops[cls]) == 'undefined') {
                 tops[cls] = [];
@@ -331,6 +406,10 @@ right:
         return false;
         
     }
+    
+    
+    
+    print (JSON.stringify(usage,null,4));
     var nusage = {};
 	var usage_left = {};
     for(var par in usage) {
@@ -340,25 +419,28 @@ right:
         }
 		var duped = false;
 		for(var dupe in usage) {
-			if (usage[par].join(',') == usage[dupe].join(',') ) {
+			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 (duped) {
-			continue;
-		}
+		 if (duped) {
+		 	continue;
+		 }
         nusage[par] = usage[par];
         
     }
-    
-    //r//int(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) {
@@ -406,6 +488,7 @@ right:
     //print(JSON.stringify(implementations,null,4));
     
 }
+imports.gi.Gtk.init(Seed.argv);
 BuildLists();
 
 // we now have a list of classes / methods that can be used..