Re-registering custom signals and class closures when loading saved images

[clg] / gtk / gtkcontainer.lisp

diff --git a/gtk/gtkcontainer.lisp b/gtk/gtkcontainer.lisp
index 8cb62b7d5cb4e6a5cde6f6fc82f1e5912befbc9c..1fe62b70f30be7ab15d3cfc2d2d8a0c74b54b8f4 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.26 2008/05/06 00:04:42 espen Exp $
 
 (in-package "GTK")
 
@@ -67,8 +67,8 @@ (defmethod shared-initialize ((container container) names &rest initargs
 (defmethod compute-signal-function ((container container) signal function object args)
   (declare (ignore signal))
   (if (eq object :children)
-      #'(lambda (&rest emission-args)
-         (let ((all-args (nconc (rest emission-args) args)))
+      #'(lambda (container &rest emission-args)
+         (let ((all-args (nconc emission-args args)))
            (container-foreach container
             #'(lambda (child)
                 (apply function child all-args)))))
@@ -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)