X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/112ac1d33aa8f9b7f3d2f9542d15431f152b1d35..a7d19b2a6d3e11b28842476b80ef68d81fb6b8ac:/glib/ginterface.lisp

diff --git a/glib/ginterface.lisp b/glib/ginterface.lisp
index 00fe5fb..a0fde4d 100644
--- a/glib/ginterface.lisp
+++ b/glib/ginterface.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: ginterface.lisp,v 1.12 2005-04-23 16:48:50 espen Exp $
+;; $Id: ginterface.lisp,v 1.15 2006-02-26 15:30:01 espen Exp $
 
 (in-package "GLIB")
 
@@ -48,13 +48,13 @@ (defmethod effective-slot-definition-class ((class ginterface-class) &rest inita
     (t (call-next-method))))
 
 (defmethod compute-effective-slot-definition-initargs ((class ginterface-class) direct-slotds)
-  (if (eq (most-specific-slot-value direct-slotds 'allocation) :property)
+  (if (eq (slot-definition-allocation (first direct-slotds)) :property)
       (nconc 
        (list :pname (signal-name-to-string 
 		     (most-specific-slot-value direct-slotds 'pname))
 	     :readable (most-specific-slot-value direct-slotds 'readable)
 	     :writable (most-specific-slot-value direct-slotds 'writable)
-	     :construct (most-specific-slot-value direct-slotds 'construct))
+	     :construct-only (most-specific-slot-value direct-slotds 'construct))
        (call-next-method))
     (call-next-method)))
 
@@ -62,11 +62,12 @@ (defmethod compute-effective-slot-definition-initargs ((class ginterface-class)
 (defmethod shared-initialize ((class ginterface-class) names &key name gtype)
   (declare (ignore names))
   (let* ((class-name (or name (class-name class)))
-	 (type-number
-	  (or
-	   (find-type-number class-name)
-	   (register-type class-name 
-	    (or (first gtype) (default-type-init-name class-name))))))
+;; 	 (type-number
+;; 	  (or
+;; 	   (find-type-number class-name)
+;; 	   (register-type class-name 
+;; 	    (or (first gtype) (default-type-init-name class-name)))))
+	 )
 ;    (type-default-interface-ref type-number)
     )
   (call-next-method))
@@ -76,40 +77,40 @@ (defmethod validate-superclass ((class ginterface-class) (super standard-class))
   (subtypep (class-name super) 'ginterface))
 
 
-(defmethod alien-type ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method alien-type ((type ginterface))
+  (declare (ignore type))
   (alien-type 'gobject))
 
-(defmethod size-of ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method size-of ((type ginterface))
+  (declare (ignore type))
   (size-of 'gobject))
 
-(defmethod from-alien-form (location (class ginterface-class) &rest args)
-  (declare (ignore class args))
-  (from-alien-form location 'gobject))
+(define-type-method from-alien-form ((type ginterface) location)
+  (declare (ignore type))
+  (from-alien-form 'gobject location))
 
-(defmethod from-alien-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method from-alien-function ((type ginterface))
+  (declare (ignore type))
   (from-alien-function 'gobject))
 
-(defmethod to-alien-form (instance (class ginterface-class) &rest args)
-  (declare (ignore class args))
-  (to-alien-form instance 'gobject))
+(define-type-method to-alien-form ((type ginterface) instance)
+  (declare (ignore type))
+  (to-alien-form 'gobject instance))
 
-(defmethod to-alien-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method to-alien-function ((type ginterface))
+  (declare (ignore type))
   (to-alien-function 'gobject))
 
-(defmethod reader-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method reader-function ((type ginterface))
+  (declare (ignore type))
   (reader-function 'gobject))
 
-(defmethod writer-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method writer-function ((type ginterface))
+  (declare (ignore type))
   (writer-function 'gobject))
 
-(defmethod destroy-function ((class ginterface-class) &rest args)
-  (declare (ignore class args))
+(define-type-method destroy-function ((type ginterface))
+  (declare (ignore type))
   (destroy-function 'gobject))