X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/edfd47ea45e0212b656fddaced3454936cf13be5..d8dd2e76465c00d5a4519bcc1ca8ef12604a7bf9:/gtk/gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 0b7623f..bd4385f 100644
--- 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.40 2007/03/12 12:59:22 espen Exp $
+;; $Id: gtkobject.lisp,v 1.42 2007/06/06 10:43:54 espen Exp $
 
 
 (in-package "GTK")
@@ -29,9 +29,7 @@ (in-package "GTK")
 ;;;; Superclass for the gtk class hierarchy
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (init-types-in-library 
-   #.(concatenate 'string (pkg-config:pkg-variable "gtk+-2.0" "libdir") 
-		          "/libgtk-x11-2.0." asdf:*dso-extension*))
+  (init-types-in-library gtk "libgtk-2.0")
 
   (defclass %object (gobject)
     ()
@@ -238,4 +236,10 @@ 	 (defclass ,child-class (,(default-container-child-name super))
 (defun container-child-class (container-class)
   (gethash container-class *container-to-child-class-mappings*))
 
-(register-derivable-type 'container "GtkContainer" 'expand-container-type 'gobject-dependencies)
+(defun container-dependencies (type options)
+  (delete-duplicates 
+   (append
+    (gobject-dependencies type options)
+    (mapcar #'param-value-type (query-container-class-child-properties type)))))
+
+(register-derivable-type 'container "GtkContainer" 'expand-container-type 'container-dependencies)