X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/853ec10e662f6bb560ecac79ed942ba871ed90e7..3a63ef2a6c503a66bf1559fc60f5e3e07d0838be:/gtk/gtkwidget.lisp?ds=sidebyside

diff --git a/gtk/gtkwidget.lisp b/gtk/gtkwidget.lisp
index 1559fe0..0320921 100644
--- a/gtk/gtkwidget.lisp
+++ b/gtk/gtkwidget.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-;; $Id: gtkwidget.lisp,v 1.11 2004-12-17 00:27:01 espen Exp $
+;; $Id: gtkwidget.lisp,v 1.13 2004-12-20 20:09:53 espen Exp $
 
 (in-package "GTK")
 
@@ -40,24 +40,24 @@
 
 (defmethod slot-unbound ((class gobject-class) (object widget) slot)
   (cond
-   ((and (eq slot 'child-slots) (slot-value object 'parent))
-    (with-slots (parent child-slots) object
+   ((and (eq slot 'child-properties) (slot-value object 'parent))
+    (with-slots (parent child-properties) object
       (setf
-       child-slots
+       child-properties
        (make-instance
 	(gethash (class-of parent) *container-to-child-class-mappings*)
 	:parent parent :child object))))
    (t (call-next-method))))
 
 
-(defun child-slot-value (widget slot)
-  (slot-value (widget-child-slots widget) slot))
+(defun child-property-value (widget slot)
+  (slot-value (widget-child-properties widget) slot))
 
-(defun (setf child-slot-value) (value widget slot)
-  (setf (slot-value (widget-child-slots widget) slot) value))
+(defun (setf child-property-value) (value widget slot)
+  (setf (slot-value (widget-child-properties widget) slot) value))
 
-(defmacro with-child-slots (slots widget &body body)
-  `(with-slots ,slots (widget-child-slots ,widget)
+(defmacro with-child-properties (slots widget &body body)
+  `(with-slots ,slots (widget-child-properties ,widget)
      ,@body))
 
 
@@ -384,5 +384,5 @@ received."
   (event gdk:event))
 
 (defun (setf widget-cursor) (cursor-type widget)
-  (let ((cursor (make-instance 'cursor  :type cursor-type)))
+  (let ((cursor (make-instance 'gdk:cursor :type cursor-type)))
     (gdk:window-set-cursor (widget-window widget) cursor)))