X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/9adccb27da69b60d058aa37867d55ea20ecf97ca..8beedfa0f30e6f332112485c3e739937e45155f9:/gtk/gtkobject.lisp?ds=sidebyside

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 3d1c67c..eb6cdb2 100644
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gtkobject.lisp,v 1.19 2004-11-06 21:39:58 espen Exp $
+;; $Id: gtkobject.lisp,v 1.21 2004-12-20 20:09:53 espen Exp $
 
 
 (in-package "GTK")
@@ -135,37 +135,26 @@
   (let* ((type (slot-definition-type slotd))
 	 (pname (slot-definition-pname slotd))
 	 (type-number (find-type-number type)))
-    (unless (slot-boundp slotd 'reader-function)
-      (setf 
-       (slot-value slotd 'reader-function)
-       #'(lambda (object)
-	   (with-slots (parent child) object	   
-	     (let ((gvalue (gvalue-new type-number)))
-	       (%container-child-get-property parent child pname gvalue)
-	       (unwind-protect
-		    (funcall (reader-function type) gvalue +gvalue-value-offset+)
-		 (gvalue-free gvalue t)))))))
+    (setf 
+     (slot-value slotd 'getter)
+     #'(lambda (object)
+	 (with-slots (parent child) object	   
+	   (let ((gvalue (gvalue-new type-number)))
+	     (%container-child-get-property parent child pname gvalue)
+	     (unwind-protect
+		 (funcall (reader-function type) gvalue +gvalue-value-offset+)
+	       (gvalue-free gvalue t))))))
     
-    (unless (slot-boundp slotd 'writer-function)
-      (setf 
-       (slot-value slotd 'writer-function)
-       #'(lambda (value object)
-	   (with-slots (parent child) object	   
-	     (let ((gvalue (gvalue-new type-number)))
-	       (funcall (writer-function type) value gvalue +gvalue-value-offset+)
-	       (%container-child-set-property parent child pname gvalue)
-;; 		   (funcall
-;; 		    (destroy-function type)
-;; 		    gvalue +gvalue-value-offset+)
-		   (gvalue-free gvalue t)
-		   value)))))
-    
-    (unless (slot-boundp slotd 'boundp-function)
-      (setf 
-       (slot-value slotd 'boundp-function)
-       #'(lambda (object)
-	   (declare (ignore object))
-	   t))))
+    (setf 
+     (slot-value slotd 'setter)
+     #'(lambda (value object)
+	 (with-slots (parent child) object	   
+	   (let ((gvalue (gvalue-new type-number)))
+	     (funcall (writer-function type) value gvalue +gvalue-value-offset+)
+	     (%container-child-set-property parent child pname gvalue)
+	     (gvalue-free gvalue t)
+	     value)))))
+ 
   (call-next-method)))
 
 
@@ -173,25 +162,23 @@
   (add-method
    generic-function
    (make-instance 'standard-method
-		  :specializers (list (find-class 'widget))
-		  :lambda-list '(widget)
-		  :function #'(lambda (args next-methods)
-				(declare (ignore next-methods))
-				(child-slot-value (first args) slot-name)))))
+    :specializers (list (find-class 'widget))
+    :lambda-list '(widget)
+    :function #'(lambda (args next-methods)
+		  (declare (ignore next-methods))
+		  (child-property-value (first args) slot-name)))))
 
 (defmethod pcl::add-writer-method
     ((class child-class) generic-function slot-name)
   (add-method
    generic-function
    (make-instance 'standard-method
-		  :specializers (list (find-class t) (find-class 'widget))
-		  :lambda-list '(value widget)
-		  :function #'(lambda (args next-methods)
-				(declare (ignore next-methods))
-				(destructuring-bind (value widget) args
-				  (setf
-				   (child-slot-value widget slot-name)
-				   value))))))
+    :specializers (list (find-class t) (find-class 'widget))
+    :lambda-list '(value widget)
+    :function #'(lambda (args next-methods)
+		  (declare (ignore next-methods))
+		  (destructuring-bind (value widget) args
+		    (setf (child-property-value widget slot-name) value))))))
 
 
 (defmethod validate-superclass ((class child-class) (super pcl::standard-class))