From: espen <espen>
Date: Wed, 26 Apr 2006 14:56:59 +0000 (+0000)
Subject: Bug fix
X-Git-Tag: clg-0-93~301
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/commitdiff_plain/48acc6ae443332d9fee80930721be128fe0982d9

Bug fix
---

diff --git a/examples/ginspect.lisp b/examples/ginspect.lisp
index 9d8c144..b52c345 100644
--- a/examples/ginspect.lisp
+++ b/examples/ginspect.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: ginspect.lisp,v 1.9 2006/02/09 22:34:09 espen Exp $
+;; $Id: ginspect.lisp,v 1.10 2006/04/26 14:56:59 espen Exp $
 
 #+sbcl(require :gtk)
 #+cmu(asdf:oos 'asdf:load-op :gtk)
@@ -132,13 +132,15 @@ (defmethod decompose-describe-object ((object symbol))
 		       *ginspect-unbound-object-marker*))
     (cons "Plist" (symbol-plist object)))))
 
-#+cmu
 (defmethod decompose-describe-object ((object standard-object))
   (values 
-   (call-next-method) t
+   (format nil "The instance is an object of type ~A." 
+    (class-name (class-of object)))
+   t
    (loop
     for slotd in (class-slots (class-of object))
-    collect (let* ((slot-name (pcl:slot-definition-name slotd))
+    when (slot-readable-p slotd)
+    collect (let* ((slot-name (slot-definition-name slotd))
 		   (slot-value (if (slot-boundp object slot-name)
 				   (slot-value object slot-name)
 				 *ginspect-unbound-object-marker*)))
diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp
index be257a5..21cf24e 100644
--- a/gdk/gdk.lisp
+++ b/gdk/gdk.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: gdk.lisp,v 1.28 2006/04/25 22:27:13 espen Exp $
+;; $Id: gdk.lisp,v 1.29 2006/04/26 15:01:05 espen Exp $
 
 
 (in-package "GDK")
@@ -436,7 +436,7 @@ (defmethod allocate-foreign ((cursor cursor) &key source mask fg bg
 (defun ensure-cursor (cursor &rest args)
   (if (typep cursor 'cursor)
       cursor
-    (apply #'make-instance 'cursor :type cursor args)))
+    (apply #'make-instance 'cursor :source cursor args)))
 
 (defbinding %cursor-new-for-display () pointer
   (display display)