Bug fix

diff --git a/examples/ginspect.lisp b/examples/ginspect.lisp
index 9d8c14416493bb9de7645a0333833fd46d5adc61..b52c345e44f7c7a11e1aeb9249cae7d2b1871c91 100644 (file)
--- 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.
 
 ;; 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)
 
 #+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)))))
 
                       *ginspect-unbound-object-marker*))
     (cons "Plist" (symbol-plist object)))))
 

-#+cmu

 (defmethod decompose-describe-object ((object standard-object))
   (values 
 (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))
    (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*)))
                   (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 be257a53d0c7ccb0908d6eff9956bdc56323cd0d..21cf24e93ff8b867e38fc1a56d1cd5b36f9f1ad6 100644 (file)
--- 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.
 
 ;; 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")
 
 
 (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
 (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)
 
 (defbinding %cursor-new-for-display () pointer
   (display display)