X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/9adccb27da69b60d058aa37867d55ea20ecf97ca..dfa4f31424800fdb6fb63514121b9cc893269276:/glib/ginterface.lisp?ds=sidebyside

diff --git a/glib/ginterface.lisp b/glib/ginterface.lisp
index f0d3dcc..b9a42b5 100644
--- a/glib/ginterface.lisp
+++ b/glib/ginterface.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: ginterface.lisp,v 1.4 2004-11-06 21:39:58 espen Exp $
+;; $Id: ginterface.lisp,v 1.9 2005-03-06 17:26:23 espen Exp $
 
 (in-package "GLIB")
 
@@ -54,19 +54,16 @@ (defmethod compute-effective-slot-definition-initargs ((class ginterface-class)
     (call-next-method)))
 
 
-(defmethod shared-initialize ((class ginterface-class) names
-			      &rest initargs &key name alien-name)
-  (declare (ignore initargs names))
-  (let* ((class-name (or name (class-name class)))
-	 (type-number
-	  (find-type-number
-	   (or (first alien-name) (default-alien-type-name class-name)) t)))
-    (register-type class-name type-number))
+(defmethod shared-initialize ((class ginterface-class) names &key name gtype)
+  (declare (ignore names))
+  (let ((class-name (or name (class-name class))))
+    (unless (find-type-number class-name)
+      (register-type class-name 
+        (or (first gtype) (default-type-init-name class-name)))))
   (call-next-method))
 
 
-(defmethod validate-superclass
-    ((class ginterface-class) (super pcl::standard-class))
+(defmethod validate-superclass ((class ginterface-class) (super standard-class))
   (subtypep (class-name super) 'ginterface))
 
 
@@ -94,6 +91,18 @@ (defmethod to-alien-function ((class ginterface-class) &rest args)
   (declare (ignore class args))
   (to-alien-function 'gobject))
 
+(defmethod reader-function ((class ginterface-class) &rest args)
+  (declare (ignore class args))
+  (reader-function 'gobject))
+
+(defmethod writer-function ((class ginterface-class) &rest args)
+  (declare (ignore class args))
+  (writer-function 'gobject))
+
+(defmethod destroy-function ((class ginterface-class) &rest args)
+  (declare (ignore class args))
+  (destroy-function 'gobject))
+
 
 ;;;;
 
@@ -117,21 +126,28 @@ (defun query-object-interface-properties (type &optional inherited-p)
     (unwind-protect
 	 (multiple-value-bind (array length)
 	     (%object-interface-list-properties iface)
-	   (unwind-protect
-		(%map-params array length type-number inherited-p)
-	     (deallocate-memory array)))
+	   (unless (null-pointer-p array)
+	     (unwind-protect
+		 (%map-params array length type-number inherited-p)
+	       (deallocate-memory array))))
 ;      (type-default-interface-unref type-number)
       )))
 
 
-(defun expand-ginterface-type (type options &rest args)
+(defun expand-ginterface-type (type forward-p options &rest args)
   (declare (ignore args))
   (let ((class (type-from-number type))
-	(slots (getf options :slots)))    
+	(slots (getf options :slots))) 
     `(defclass ,class (,(supertype type))
-      ,(slot-definitions class (query-object-interface-properties type) slots)
+       ,(unless forward-p
+	  (slot-definitions class (query-object-interface-properties type) slots))
       (:metaclass ginterface-class)
-      (:alien-name ,(find-type-name type)))))
+      (:gtype ,(find-type-init-function type)))))
 
+(defun ginterface-dependencies (type)
+  (delete-duplicates 
+   (cons
+    (supertype type)
+    (mapcar #'param-value-type (query-object-interface-properties type)))))
 
-(register-derivable-type 'ginterface "GInterface" 'expand-ginterface-type)
+(register-derivable-type 'ginterface "GInterface" 'expand-ginterface-type 'ginterface-dependencies)