Removed the need for dummy container-child classes.

[clg] / gtk / gtkcontainer.lisp

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.
 
-;; $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")
 
@@ -79,13 +79,21 @@ (defbinding %container-add () nil
   (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
-      #'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)