X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/8f205b087459a43db37d7c6fa5992303aaa598d3..80c00d73e8060c5a7cb8944e20c1412646e0796e:/gtk/gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 1869e9a..2444c08 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.38 2006-08-31 09:08:23 espen Exp $
+;; $Id: gtkobject.lisp,v 1.41 2007-05-10 20:13:42 espen Exp $
 
 
 (in-package "GTK")
@@ -170,22 +170,24 @@ (defmethod compute-slot-writer-function ((slotd effective-child-slot-definition)
 	  value))))
 
 
-(defmethod add-reader-method ((class container-child-class) generic-function slot-name)
+(defmethod add-reader-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation)
   (add-method
    generic-function
    (make-instance 'standard-method
     :specializers (list (find-class 'widget))
     :lambda-list '(widget)
+    :documentation (or #?(sbcl>= 1 0 2)slot-documentation "automatically generated reader method")
     :function #'(lambda (args next-methods)
 		  (declare (ignore next-methods))
 		  (child-property-value (first args) slot-name)))))
 
-(defmethod add-writer-method ((class container-child-class) generic-function slot-name)
+(defmethod add-writer-method ((class container-child-class) generic-function slot-name #?(sbcl>= 1 0 2)slot-documentation)
   (add-method
    generic-function
    (make-instance 'standard-method
     :specializers (list (find-class t) (find-class 'widget))
     :lambda-list '(value widget)
+    :documentation (or #?(sbcl>= 1 0 2)slot-documentation "automatically generated reader method")
     :function #'(lambda (args next-methods)
 		  (declare (ignore next-methods))
 		  (destructuring-bind (value widget) args
@@ -233,7 +235,13 @@ 	 (defclass ,child-class (,(default-container-child-name super))
 	   (:metaclass container-child-class)
 	   (:container ,class))))))
 
-(defun container-class-child-class (container-class)
+(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)