X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/1eae767d7c50172c611fe18b47d1713974737383..dd4dbc49f138e38d7e696f8f486eb8fa7b164894:/gtk/gtkobject.lisp diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp index ab645e4..bdc6c18 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.31 2006-02-15 09:47:42 espen Exp $ (in-package "GTK") @@ -125,9 +125,11 @@ (defmethod effective-slot-definition-class ((class child-class) &rest initargs) (t (call-next-method)))) (defmethod compute-effective-slot-definition-initargs ((class child-class) direct-slotds) - (if (eq (most-specific-slot-value direct-slotds 'allocation) :property) + (if (eq (slot-definition-allocation (first direct-slotds)) :property) (nconc (list :pname (most-specific-slot-value direct-slotds 'pname)) + ;; Need this to prevent type expansion in SBCL (>= 0.9.8) + (list :type (most-specific-slot-value direct-slotds 'type)) (call-next-method)) (call-next-method)))