X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/b205ac7c2b939550aecef8a019343f5f43aff449..b008da5a007572a07f736534e15a7a3845c97745:/examples/ginspect.lisp

diff --git a/examples/ginspect.lisp b/examples/ginspect.lisp
index a5dd6c7..9d8c144 100644
--- a/examples/ginspect.lisp
+++ b/examples/ginspect.lisp
@@ -20,9 +20,16 @@
 ;; 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.6 2006/02/02 22:48:53 espen Exp $
+;; $Id: ginspect.lisp,v 1.9 2006/02/09 22:34:09 espen Exp $
 
-(in-package :gtk)
+#+sbcl(require :gtk)
+#+cmu(asdf:oos 'asdf:load-op :gtk)
+
+(defpackage "GINSPECT"
+  (:use "COMMON-LISP" "GLIB" "GTK" #+cmu"PCL" #+sbcl"SB-PCL")
+  (:export "GINSPECT" "GINSPECT-TOPLEVELS"))
+
+(in-package "GINSPECT")
 
 (defvar *ginspect-unbound-object-marker* 
   #+cmu (gensym "UNBOUND-OBJECT-")
@@ -35,6 +42,12 @@
 (defgeneric decompose-describe-object (object))
 
 
+;; A container to hold lisp objects "inside" the tree store
+(defclass object-container (gobject)
+  ((object :initarg :object))
+  (:metaclass gobject-class))
+
+
 (defun ginspect (object)
   (let* ((store (make-instance 'tree-store 
 		 :column-types '(string string gobject boolean)
@@ -62,8 +75,8 @@
 	     ;; Remove old children
 	     (when valid
 	       (loop while (tree-store-remove store child-iter))))
-	   (let ((gobject (tree-model-value store iter 'object)))
-	     (insert-parts (object-data gobject 'object) store iter))
+	   (let ((container (tree-model-value store iter 'object)))
+	     (insert-parts (slot-value container 'object) store iter))
 	   (tree-view-expand-row view path nil))))
 
     (make-instance 'dialog
@@ -108,15 +121,16 @@
 (defmethod decompose-describe-object ((object symbol))
   (values 
    (call-next-method) t
-   (cons "Name" (symbol-name object)) 
-   (cons "Package" (symbol-package object))
-   (cons "Value" (if (boundp object)
-		     (symbol-value object)
-		   *ginspect-unbound-object-marker*))
-   (cons "Function" (if (fboundp object)
-			(symbol-function  object)
-		      *ginspect-unbound-object-marker*))
-   (cons "Plist" (symbol-plist object))))
+   (list
+    (cons "Name" (symbol-name object)) 
+    (cons "Package" (symbol-package object))
+    (cons "Value" (if (boundp object)
+		      (symbol-value object)
+		    *ginspect-unbound-object-marker*))
+    (cons "Function" (if (fboundp object)
+			 (symbol-function  object)
+		       *ginspect-unbound-object-marker*))
+    (cons "Plist" (symbol-plist object)))))
 
 #+cmu
 (defmethod decompose-describe-object ((object standard-object))
@@ -152,15 +166,14 @@
   "<unbound>")
 
 (defmethod insert-object ((object t) store parent &optional (name ""))
-  (let ((gobject (make-instance 'gobject)) ; to "hang" the lisp object on
+  (let ((container (make-instance 'object-container :object object))
 	(has-parts (object-has-parts-p object)))
-    (setf (object-data gobject 'object) object)
     (let ((iter (tree-store-append store parent 
 		 (vector name (object-to-string object) 
-			 gobject (not has-parts)))))
+			 container (not has-parts)))))
       (when has-parts
 	;; Insert dummy child
-	(tree-store-append store iter (vector "" "" gobject t))))))
+	(tree-store-append store iter (vector "" "" container t))))))
 
 (defmethod insert-parts :around ((object t) store parent)
   (when (object-has-parts-p object)