Update to match changes in gtype.lisp

diff --git a/glib/gboxed.lisp b/glib/gboxed.lisp
index e53b01f9bec5a45fffeaefe69853336f6bfac996..393cb1855859f806bc6b1f7da69624b094673934 100644 (file)
--- a/glib/gboxed.lisp
+++ b/glib/gboxed.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
 
 ;; 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: gboxed.lisp,v 1.5 2001-05-31 12:36:20 espen Exp $
+;; $Id: gboxed.lisp,v 1.6 2001-10-21 22:02:01 espen Exp $

 
 (in-package "GLIB")
 
 
 (in-package "GLIB")
 


@@ -67,7 +67,7 @@ (defun expand-boxed-type (type-number &optional slots)
      (:metaclass boxed-class)
      (:alien-name ,(find-type-name type-number))))
 
      (:metaclass boxed-class)
      (:alien-name ,(find-type-name type-number))))
 

-(register-derivable-type 'boxed "GBoxed" :expand 'expand-boxed-type)
+(register-derivable-type 'boxed "GBoxed" 'expand-boxed-type)

 
 ;;;; Special boxed types
 
 
 ;;;; Special boxed types
 

diff --git a/glib/genums.lisp b/glib/genums.lisp
index f688f9fa6d7bfaf70df415806e4d65b1deb9c5c1..82008268d90a41ce00630d43aa660c3e865a505f 100644 (file)
--- a/glib/genums.lisp
+++ b/glib/genums.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
 
 ;; 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: genums.lisp,v 1.2 2001-05-11 16:04:33 espen Exp $
+;; $Id: genums.lisp,v 1.3 2001-10-21 22:02:01 espen Exp $

 
 (in-package "GLIB")
 
 
 (in-package "GLIB")
 


@@ -164,9 +164,10 @@ (defun query-flags-values (type)
 
 ;;;;
 
 
 ;;;;
 

-(defun expand-enum-type (type-number &optional mappings)
+(defun expand-enum-type (type-number &optional options)

   (let* ((super (supertype type-number))
         (type (type-from-number type-number))
   (let* ((super (supertype type-number))
         (type (type-from-number type-number))

+        (mappings (getf options :mappings))

         (expanded-mappings
          (append
           (delete-if
         (expanded-mappings
          (append
           (delete-if


@@ -184,6 +185,6 @@ (defun expand-enum-type (type-number &optional mappings)
        (deftype ,type () '(,super ,@expanded-mappings)))))
 
 
        (deftype ,type () '(,super ,@expanded-mappings)))))
 
 

-(register-derivable-type 'enum "GEnum" :expand 'expand-enum-type)
-(register-derivable-type 'flags "GFlags" :expand 'expand-enum-type)
+(register-derivable-type 'enum "GEnum" 'expand-enum-type)
+(register-derivable-type 'flags "GFlags" 'expand-enum-type)