X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/616e14307b764456179d9931d23c71fc23016d44..19406f20ddb51fdcf94bf9a91c12c53717bad724:/gtk/gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 7e5c84b..1c8421f 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.34 2006/04/26 10:30:02 espen Exp $
+;; $Id: gtkobject.lisp,v 1.41 2007/05/10 20:13:42 espen Exp $
 
 
 (in-package "GTK")
@@ -31,7 +31,7 @@
 (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.so"))
+		          "/libgtk-x11-2.0." asdf:*dso-extension*))
 
   (defclass %object (gobject)
     ()
@@ -135,7 +135,12 @@
        (call-next-method))
     (call-next-method)))
 
-(defmethod compute-slot-reader-function ((slotd effective-child-slot-definition))
+(defmethod slot-readable-p ((slotd effective-child-slot-definition))
+  (declare (ignore slotd))
+  t)
+
+(defmethod compute-slot-reader-function ((slotd effective-child-slot-definition) &optional signal-unbound-p)
+  (declare (ignore signal-unbound-p))
   (let* ((type (slot-definition-type slotd))
 	 (pname (slot-definition-pname slotd))
 	 (reader (reader-function type :ref :get)))
@@ -146,6 +151,10 @@
 	    (%container-child-get-property parent child pname gvalue)
 	    (funcall reader gvalue +gvalue-value-offset+))))))
 
+(defmethod slot-writable-p ((slotd effective-child-slot-definition))
+  (declare (ignore slotd))
+  t)
+
 (defmethod compute-slot-writer-function ((slotd effective-child-slot-definition))
   (let* ((type (slot-definition-type slotd))
 	 (pname (slot-definition-pname slotd))
@@ -161,22 +170,24 @@
 	  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
@@ -188,7 +199,7 @@
   t)
 
 
-(defclass container-child ()
+(defclass container-child (virtual-slots-object)
   ((parent :initarg :parent :type container)
    (child :initarg :child :type widget)))
 
@@ -224,5 +235,13 @@
 	   (:metaclass container-child-class)
 	   (:container ,class))))))
 
+(defun container-child-class (container-class)
+  (gethash container-class *container-to-child-class-mappings*))
+
+(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 'gobject-dependencies)
+(register-derivable-type 'container "GtkContainer" 'expand-container-type 'container-dependencies)