X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/cd859052dc7a17bbfa93df3c31b79fe730194047..09f6e23711ab7b3b8f713f0cabdaeffcc7c4ac20:/glib/gtype.lisp?ds=sidebyside

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index f4a3d60..2a746e2 100644
--- a/glib/gtype.lisp
+++ b/glib/gtype.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: gtype.lisp,v 1.36 2006-02-01 22:48:39 espen Exp $
+;; $Id: gtype.lisp,v 1.38 2006-02-04 12:15:32 espen Exp $
 
 (in-package "GLIB")
 
@@ -279,35 +279,28 @@
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass ginstance-class (proxy-class)
-    ((foreign-init))))
+    ((gtype :initarg :gtype :initform nil :reader ginstance-class-gtype))))
 
 
-(defmethod shared-initialize ((class ginstance-class) names &key name gtype)
-  (call-next-method)
-  (setf 
-   (slot-value class 'foreign-init) 
-   (or (first gtype) (default-type-init-name (or name (class-name class))))))
-
+(defmethod compute-foreign-size ((class ginstance-class))
+  (type-instance-size (find-type-number (class-name class))))
 
 (defmethod finalize-inheritance ((class ginstance-class))
   (call-next-method)
   (let* ((class-name (class-name class))
 	 (super (most-specific-proxy-superclass class))
-	 (foreign-init (slot-value class 'foreign-init))
+	 (gtype (or 
+		 (first (ginstance-class-gtype class))
+		 (default-alien-type-name class-name)))
 	 (type-number
 	  (or 
 	   (find-type-number class-name)
-	   (if (or 
-		(symbolp foreign-init)
-		(type-number-from-glib-name foreign-init nil))
-	       (register-type class-name foreign-init)
-	     (register-new-type class-name (class-name super) foreign-init)))))
+	   (if (or (symbolp gtype) (type-number-from-glib-name gtype nil))
+	       (register-type class-name gtype)
+	     (register-new-type class-name (class-name super) gtype)))))
     (unless (eq (class-name super) (supertype type-number))
       (warn "~A is the super type for ~A in the gobject type system."
-       (supertype type-number) class-name))
-
-    (unless (slot-boundp class 'size)
-      (setf (slot-value class 'size) (type-instance-size type-number)))))
+       (supertype type-number) class-name))))
 
 
 (defmethod validate-superclass ((class ginstance-class) (super standard-class))
@@ -318,8 +311,10 @@
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass ginstance (proxy)
-    ((class :allocation :alien :type pointer))
-    (:metaclass proxy-class)))
+    (;(class :allocation :alien :type pointer :offset 0)
+     )
+    (:metaclass proxy-class)
+    (:size #.(size-of 'pointer))))
 
 (defun %type-number-of-ginstance (location)
   (let ((class (sap-ref-sap location 0)))