Removed the need for dummy container-child classes.

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 128cd67a8e3bdc6921b11959fa3dc7a387e20768..ac0a8361418abc91182d9f5eafec73490df5a34c 100644 (file)
--- a/gtk/gtkcontainer.lisp
+++ b/gtk/gtkcontainer.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.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: gtkcontainer.lisp,v 1.24 2007-07-04 14:24:54 espen Exp $
+;; $Id: gtkcontainer.lisp,v 1.25 2008-03-06 22:02:08 espen Exp $

 
 (in-package "GTK")
 
 
 (in-package "GTK")
 


@@ -79,13 +79,21 @@ (defbinding %container-add () nil
   (container container)
   (widget widget))
 
   (container container)
   (widget widget))
 

+(defun find-child-class (container-class)
+  (or
+   (gethash container-class *container-to-child-class-mappings*)
+   (setf (gethash container-class *container-to-child-class-mappings*)
+    (or
+     (when (eq container-class (find-class 'container))
+       (find-class 'container-child))
+     (find-child-class (find-class (supertype container-class)))))))
+

 (defun init-child-slots (container child args)
   (when args
     (setf
      (slot-value child 'child-properties)
      (apply
 (defun init-child-slots (container child args)
   (when args
     (setf
      (slot-value child 'child-properties)
      (apply

-      #'make-instance
-      (gethash (class-of container) *container-to-child-class-mappings*)
+      #'make-instance (find-child-class (class-of container))

       :parent container :child child args))))
 
 (defmethod container-add ((container container) (widget widget) &rest args)
       :parent container :child child args))))
 
 (defmethod container-add ((container container) (widget widget) &rest args)

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 7d57bfdc004692940f481ef498eb07fbd94f3623..c098921459276ee8f256c50d2b90c91dee44fd8f 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.
 
 ;; 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")
 
 
 (in-package "GTK")


@@ -226,12 +226,18 @@ (defbinding %container-class-list-child-properties () pointer
   (class pointer)
   (n-properties unsigned-int :out))
 
   (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
   (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)
        (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)
        (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*))
 
 (defun container-child-class (container-class)
   (gethash container-class *container-to-child-class-mappings*))