X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/d9a443c989d6582b59c0ac6077aaa2c3ce87855b..9706ddd7b4d93a327d83e2bb9e4dcf1de8675245:/gtk/gtkaction.lisp diff --git a/gtk/gtkaction.lisp b/gtk/gtkaction.lisp index 428717b..ae5043b 100644 --- a/gtk/gtkaction.lisp +++ b/gtk/gtkaction.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: gtkaction.lisp,v 1.1 2004-12-04 18:03:21 espen Exp $ +;; $Id: gtkaction.lisp,v 1.3 2005-02-03 23:09:09 espen Exp $ (in-package "GTK") @@ -44,15 +44,10 @@ (defmethod initialize-instance ((action-group action-group) &rest initargs &key action actions) (declare (ignore action actions)) - (call-next-method) - (flet ((add-action (action) - (action-group-add-action action-group action))) - (loop - as (initarg value . rest) = initargs then rest - do (case initarg - (:action (add-action value)) - (:actions (mapc #'add-action value))) - while rest))) + (prog1 + (call-next-method) + (initial-add action-group #'action-group-add-action + initargs :action :actions))) (defbinding action-group-get-action () action (action-group action-group) @@ -86,7 +81,7 @@ (defmethod initialize-instance ((action radio-action) &key group value) (call-next-method) - (setf (slot-value action '%value) (system:sap-int (proxy-location action))) + (setf (slot-value action '%value) (sap-int (proxy-location action))) (setf (object-data action 'radio-action-value) value) (when group (radio-action-add-to-group action group)))