Added note saying the file should probably be treated as being GPL

[clg] / gtk / gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index c95abd459dd2b2cbd3a4d00d5dd0ce1033790e5d..a0c9c7818c5f516cdb6e2ac3a4348f5fb1fb8412 100644 (file)
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtkobject.lisp,v 1.46 2008/03/04 16:03:38 espen Exp $
+;; $Id: gtkobject.lisp,v 1.47 2008/03/06 22:02:08 espen Exp $
 
 
 (in-package "GTK")
@@ -226,12 +226,18 @@ (defbinding %container-class-list-child-properties () pointer
   (class pointer)
   (n-properties unsigned-int :out))
 
-(defun query-container-class-child-properties (type-number)
+(defun query-container-class-child-properties (type-number &optional owner-only-p)
   (let ((class (type-class-ref type-number)))
     (multiple-value-bind (array length)
        (%container-class-list-child-properties class)
       (unwind-protect
-         (map-c-vector 'list #'identity array 'param length)
+         (let ((properties (map-c-vector 'list #'identity array 'param length)))
+           (if owner-only-p
+               (delete-if 
+                 #'(lambda (property)
+                     (not (eql (slot-value property 'glib::owner-type) type-number)))
+                 properties)
+             properties))
        (deallocate-memory array)))))
 
 (defun default-container-child-name (container-class)
@@ -245,11 +251,12 @@ (defun expand-container-type (type forward-p options)
        (expand-gobject-type type t options)
       `(progn
         ,(expand-gobject-type type nil options)
-        (defclass ,child-class (,(default-container-child-name super))
-          ,(slot-definitions child-class 
-            (query-container-class-child-properties type) nil)
-          (:metaclass container-child-class)
-          (:container ,class))))))
+        ,(let ((child-properties (query-container-class-child-properties type t)))
+           (when child-properties
+             `(defclass ,child-class (,(default-container-child-name super))
+                ,(slot-definitions child-class child-properties nil)
+                (:metaclass container-child-class)
+                (:container ,class))))))))
 
 (defun container-child-class (container-class)
   (gethash container-class *container-to-child-class-mappings*))