X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/6baf860c07c91b2209e4738f469248e7d8f4d6eb..145300db11eed3a0b02367f3a3f14c7ca3361a8c:/gtk/gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 8721506..cbfb966 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.22 2005/02/01 15:24:56 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))
@@ -221,17 +208,19 @@
 (defun default-container-child-name (container-class)
   (intern (format nil "~A-CHILD" container-class)))
 
-(defun expand-container-type (type &optional options)
+(defun expand-container-type (type forward-p options)
   (let* ((class (type-from-number type))
 	 (super (supertype type))
 	 (child-class (default-container-child-name class)))
-    `(progn
-       ,(expand-gobject-type type options)
-       (defclass ,child-class (,(default-container-child-name super))
-	 ,(slot-definitions child-class 
-	   (query-container-class-child-properties type) nil)
-	 (:metaclass child-class)
-	 (:container ,class)))))
-
-
-(register-derivable-type 'container "GtkContainer" 'expand-container-type)
+    (if forward-p 
+	(expand-gobject-type type t options)
+      `(progn
+	 ,(expand-gobject-type type nil options)
+	 (defclass ,child-class (,(default-container-child-name super))
+	   ,(slot-definitions child-class 
+	     (query-container-class-child-properties type) nil)
+	   (:metaclass child-class)
+	   (:container ,class))))))
+
+
+(register-derivable-type 'container "GtkContainer" 'expand-container-type 'gobject-dependencies)