From: espen <espen>
Date: Wed, 8 Feb 2006 21:53:34 +0000 (+0000)
Subject: Changes required by SBCL 0.9.8
X-Git-Tag: clg-0-92~71
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/commitdiff_plain/d905d6efa34d58c8ba9659b33bd0ed9ae84e7f79

Changes required by SBCL 0.9.8
---

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index 6f89ac9..8f6228e 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.42 2006/02/06 22:58:35 espen Exp $
+;; $Id: gtype.lisp,v 1.43 2006/02/08 21:53:34 espen Exp $
 
 (in-package "GLIB")
 
@@ -283,8 +283,16 @@   (defclass ginstance-class (proxy-class)
     ((gtype :initarg :gtype :initform nil :reader ginstance-class-gtype))))
 
 
-(defmethod compute-foreign-size ((class ginstance-class))
-  (type-instance-size (find-type-number (class-name class))))
+(defun update-size (class)
+  (let ((type-number (find-type-number class)))
+    (cond
+     ((not (slot-boundp class 'size))
+      (setf (slot-value class 'size) (type-instance-size type-number)))
+     ((and 
+       (slot-boundp class 'size) 
+       (not (= (type-instance-size type-number) (slot-value class 'size))))
+      (warn "Size mismatch for class ~A" class)))))
+
 
 (defmethod finalize-inheritance ((class ginstance-class))
   (call-next-method)
@@ -308,7 +316,17 @@ 		 (default-alien-type-name class-name)))
 	   (supertype type-number) 
 	   (not (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))))
+       (supertype type-number) class-name)))
+  
+  (update-size class))
+
+
+(defmethod shared-initialize ((class ginstance-class) names &rest initargs)
+  (declare (ignore initargs))
+  (call-next-method)
+  (when (class-finalized-p class)
+    (update-size class)))
+
 
 (defmethod validate-superclass ((class ginstance-class) (super standard-class))
   (subtypep (class-name super) 'ginstance))
diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index b0dc9e5..09e1746 100644
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.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: gtkobject.lisp,v 1.29 2006/02/04 12:17:45 espen Exp $
+;; $Id: gtkobject.lisp,v 1.30 2006/02/08 21:57:26 espen Exp $
 
 
 (in-package "GTK")
@@ -128,6 +128,8 @@ (defmethod compute-effective-slot-definition-initargs ((class child-class) direc
   (if (eq (most-specific-slot-value direct-slotds 'allocation) :property)
       (nconc 
        (list :pname (most-specific-slot-value direct-slotds 'pname))
+       ;; Need this to prevent type type expansion in SBCL (>= 0.9.8)
+       (list :type (most-specific-slot-value direct-slotds 'type))
        (call-next-method))
     (call-next-method)))
 
diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index c99d176..916c2d9 100644
--- a/gtk/gtkwidget.lisp
+++ b/gtk/gtkwidget.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: gtkwidget.lisp,v 1.18 2005/04/23 16:48:52 espen Exp $
+;; $Id: gtkwidget.lisp,v 1.19 2006/02/08 22:00:09 espen Exp $
 
 (in-package "GTK")
 
@@ -55,12 +55,6 @@ (defmethod slot-unbound ((class gobject-class) (object widget)
 	:parent parent :child object))))
    ((call-next-method))))
 
-(defmethod slot-boundp-using-class ((class gobject-class) (object widget) slot)
-  (or
-   (and 
-    (eq (slot-definition-name slot) 'child-properties) 
-    (slot-boundp object 'parent))
-   (call-next-method)))
 
 (defmethod compute-signal-function ((widget widget) signal function object)
   (if (eq object :parent)