--- gadgets.lisp__before-Paul-Werkowski 2005-12-25 21:43:55.957060368 +0100 +++ gadgets.lisp 2005-12-25 21:46:55.621747184 +0100 @@ -2742,13 +2742,8 @@ (defclass gadget-output-record (basic-output-record displayed-output-record) ((gadget :initarg :gadget :accessor gadget))) -(defmethod initialize-instance :after ((record gadget-output-record) &key child x y) - (let* ((sr (compose-space child)) - (width (space-requirement-width sr)) - (height (space-requirement-height sr))) - (allocate-space child width height) - (setf (gadget record) child - (rectangle-edges* record) (values x y (+ x width) (+ y height))))) +(defmethod initialize-instance :after ((record gadget-output-record) &key child) + (setf (gadget record) child)) (defmethod note-output-record-got-sheet ((record gadget-output-record) sheet) (multiple-value-bind (x y) (output-record-position record) @@ -2801,6 +2796,11 @@ (,gadget-output-record (make-instance 'gadget-output-record :child ,gadget :x (round ,x) :y (round ,y)))) (stream-add-output-record ,stream ,gadget-output-record) + (let* ((sr (compose-space ,gadget)) + (width (space-requirement-width sr)) + (height (space-requirement-height sr))) + (allocate-space ,gadget width height) + (setf (rectangle-edges* ,gadget-output-record) (values ,x ,y (+ ,x width) (+ ,y height)))) (setup-gadget-record ,stream ,gadget-output-record (round ,x) (round ,y)) (values ,gadget ,gadget-output-record)))))