X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/d905d6efa34d58c8ba9659b33bd0ed9ae84e7f79..4e431775e43db589bacc4f643613ede83a0a4025:/gtk/gtkobject.lisp diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp index 09e1746..a469b91 100644 --- a/gtk/gtkobject.lisp +++ b/gtk/gtkobject.lisp @@ -20,22 +20,12 @@ ;; 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.30 2006/02/08 21:57:26 espen Exp $ +;; $Id: gtkobject.lisp,v 1.32 2006/02/26 15:22:07 espen Exp $ (in-package "GTK") -;;;; Misc utils - -; (defun name-to-string (name) -; (substitute #\_ #\- (string-downcase (string name)))) - -; (defun string-to-name (name &optional (package "KEYWORD")) -; (intern (substitute #\- #\_ (string-upcase name)) package)) - - - ;;;; Superclass for the gtk class hierarchy (eval-when (:compile-toplevel :load-toplevel :execute) @@ -125,11 +115,9 @@ (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 type expansion in SBCL (>= 0.9.8) - (list :type (most-specific-slot-value direct-slotds 'type)) (call-next-method)) (call-next-method)))