Update of /project/cells/cvsroot/cell-cultures/celtic In directory common-lisp.net:/tmp/cvs-serv8831/celtic Modified Files: button.lisp frame.lisp widget-item.lisp Removed Files: base.lisp Log Message: Date: Sun Jun 27 21:25:14 2004 Author: ktilton Index: cell-cultures/celtic/button.lisp diff -u cell-cultures/celtic/button.lisp:1.2 cell-cultures/celtic/button.lisp:1.3 --- cell-cultures/celtic/button.lisp:1.2 Sun Jun 27 16:54:28 2004 +++ cell-cultures/celtic/button.lisp Sun Jun 27 21:25:14 2004 @@ -30,7 +30,7 @@ -bitmap -borderwidth -cursor -disabledforeground -font -foreground -highlightbackground -highlightcolor -highlightthickness -image -justify -padx -pady -relief -repeatdelay - -repeatinterval -takefocus -text -textvariable (-uline -underline) -wraplength + -repeatinterval -takefocus -text -textvariable -underline -wraplength (-command nil) -compound -default -height -overrelief -state -width)) Index: cell-cultures/celtic/frame.lisp diff -u cell-cultures/celtic/frame.lisp:1.2 cell-cultures/celtic/frame.lisp:1.3 --- cell-cultures/celtic/frame.lisp:1.2 Sun Jun 27 16:54:28 2004 +++ cell-cultures/celtic/frame.lisp Sun Jun 27 21:25:14 2004 @@ -45,6 +45,19 @@ -takefocus -background (tk-class -class) -colormap -container -height -visual -width -text -labelanchor -labelwidget)) +(defmodel stack (frame) + () + (:default-initargs + :kid-slots (lambda (self) + (declare (ignore self)) + (list + (mk-kid-slot (layout :if-missing t) + (c? (format nil "pack~{ ~a~} -side {top} -anchor nw" + (path self)))))))) +(defun stack (&rest init-args) + (apply 'make-instance 'stack init-args)) + + (defun test-labelframe () (make-be 'labelframe :text "Considering" Index: cell-cultures/celtic/widget-item.lisp diff -u cell-cultures/celtic/widget-item.lisp:1.1 cell-cultures/celtic/widget-item.lisp:1.2 --- cell-cultures/celtic/widget-item.lisp:1.1 Sat Jun 26 11:38:38 2004 +++ cell-cultures/celtic/widget-item.lisp Sun Jun 27 21:25:14 2004 @@ -35,8 +35,7 @@ :initform (c? (format nil "~a.~a" (if (fm-parent self) (path .parent) "") (name self)))) - (layout :reader layout :initarg :layout - :initform (c? (format nil "pack ~a" (path self)))) + (layout :reader layout :initarg :layout :initform nil) (configurations :reader configurations :initarg :configurations :initform nil)) (:default-initargs :md-name (create-name))) @@ -98,7 +97,7 @@ )) (defmethod not-to-be :after ((self item)) - (trc "whacking item" self) + (trc nil "whacking item" self) (tk-send (format nil "~a delete ~a" (path (upper self widget)) (id-no self)))) (defmethod make-tk-instance :after ((self item))