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

diff --git a/glib/ginterface.lisp b/glib/ginterface.lisp
index b54c665..1882d35 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.5 2004-11-07 15:54:15 espen Exp $
+;; $Id: ginterface.lisp,v 1.7 2005-02-03 23:09:04 espen Exp $
 
 (in-package "GLIB")
 
@@ -65,8 +65,7 @@ (defmethod shared-initialize ((class ginterface-class) names
   (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))
 
 
@@ -136,14 +135,17 @@ (defun query-object-interface-properties (type &optional inherited-p)
       )))
 
 
-(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)))))
 
+(defun ginterface-dependencies (type)
+  (delete-duplicates (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)