Removed dependency of some internal PCL symbols

[clg] / glib / genums.lisp

diff --git a/glib/genums.lisp b/glib/genums.lisp
index 4d148e8dfcd18df8326f482b7fa4a12f1f3c5c72..14bff9a4f276ee06d9a510f8debd2a0d62efb683 100644 (file)
--- a/glib/genums.lisp
+++ b/glib/genums.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.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: genums.lisp,v 1.15 2006/02/04 12:15:32 espen Exp $
+;; $Id: genums.lisp,v 1.17 2006/02/06 18:12:19 espen Exp $

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


@@ -87,7 +87,8 @@ (defmethod reader-function ((type (eql 'enum)) &rest args)
   (declare (ignore type))
   (let ((reader (reader-function 'signed))
        (function (apply #'from-alien-function 'enum args)))
   (declare (ignore type))
   (let ((reader (reader-function 'signed))
        (function (apply #'from-alien-function 'enum args)))

-    #'(lambda (location &optional (offset 0))
+    #'(lambda (location &optional (offset 0) weak-p)
+       (declare (ignore weak-p))

        (funcall function (funcall reader location offset)))))
 
 (defun enum-int (enum type)
        (funcall function (funcall reader location offset)))))
 
 (defun enum-int (enum type)


@@ -134,7 +135,8 @@        (defmethod writer-function ((type (eql ',name)) &rest args)
        (defmethod reader-function ((type (eql ',name)) &rest args)
         (declare (ignore type args))
         (let ((reader (reader-function 'signed)))
        (defmethod reader-function ((type (eql ',name)) &rest args)
         (declare (ignore type args))
         (let ((reader (reader-function 'signed)))

-          #'(lambda (location &optional (offset 0))
+          #'(lambda (location &optional (offset 0) weak-p)
+              (declare (ignore weak-p))

               (,int-enum (funcall reader location offset))))))))
 
 
               (,int-enum (funcall reader location offset))))))))
 
 


@@ -209,7 +211,8 @@ (defmethod reader-function ((type (eql 'flags)) &rest args)
   (declare (ignore type))
   (let ((reader (reader-function 'unsigned))
        (function (apply #'from-alien-function 'flags args)))
   (declare (ignore type))
   (let ((reader (reader-function 'unsigned))
        (function (apply #'from-alien-function 'flags args)))

-    #'(lambda (location &optional (offset 0))
+    #'(lambda (location &optional (offset 0) weak-p)
+       (declare (ignore weak-p))

        (funcall function (funcall reader location offset)))))
 
 
        (funcall function (funcall reader location offset)))))
 
 


@@ -265,7 +268,8 @@        (defmethod writer-function ((type (eql ',name)) &rest args)
        (defmethod reader-function ((type (eql ',name)) &rest args)
         (declare (ignore type args))
         (let ((reader (reader-function 'signed)))
        (defmethod reader-function ((type (eql ',name)) &rest args)
         (declare (ignore type args))
         (let ((reader (reader-function 'signed)))

-          #'(lambda (location &optional (offset 0))
+          #'(lambda (location &optional (offset 0) weak-p)
+              (declare (ignore weak-p))

               (,int-flags (funcall reader location offset))))))))
 
 
               (,int-flags (funcall reader location offset))))))))
 
 


@@ -277,7 +281,7 @@ (defun %query-enum-or-flags-values (query-function class type)
       (funcall query-function (type-class-ref type))
     (let ((values nil)
          (size (foreign-size (find-class class)))
       (funcall query-function (type-class-ref type))
     (let ((values nil)
          (size (foreign-size (find-class class)))

-         (proxy (make-instance class :location sap)))
+         (proxy (ensure-proxy-instance class sap)))

       (dotimes (i length)
        (with-slots (location nickname value) proxy
          (setf location sap)
       (dotimes (i length)
        (with-slots (location nickname value) proxy
          (setf location sap)