Unified API for all types of radio objects.

[clg] / gtk / gtkutils.lisp

diff --git a/gtk/gtkutils.lisp b/gtk/gtkutils.lisp
index 94706b1a3d466cec880cdaaed3a8f8c2cfc9f848..1166f150a91a2c444a9beefe911c9cb82a7581a8 100644 (file)
--- a/gtk/gtkutils.lisp
+++ b/gtk/gtkutils.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: gtkutils.lisp,v 1.4 2004-12-04 18:24:01 espen Exp $
+;; $Id: gtkutils.lisp,v 1.6 2005-01-06 21:06:54 espen Exp $
 
 
 (in-package "GTK")
@@ -52,52 +52,42 @@ (defun create-toggle-button (label callback &optional initstate &rest initargs)
 (defun create-check-button (label callback &optional initstate &rest initargs)
   (%create-toggleable-button 'check-button label callback initstate initargs))
 
-(defun create-radio-button-group (specs active &optional callback &rest args)
-  (let ((group nil)
-       (i 0))
-    (mapcar
-     #'(lambda (spec)
-        (destructuring-bind
-            (label &optional object &rest initargs) (mklist spec)
-          (let ((button
-                 (apply
-                  #'make-instance 'radio-button
-                  :label label :visible t initargs)))
-            (when group (%radio-button-set-group button group))
-            (setq group (%radio-button-get-group button))
-            (cond
-             (callback
-              (signal-connect
-               button 'toggled
-               #'(lambda ()
-                   (when (toggle-button-active-p button)
-                     (apply (funcallable callback) object args)))))
-             (object
-              (signal-connect
-               button 'toggled
-               #'(lambda ()
-                   (apply
-                    (funcallable object)
-                    (toggle-button-active-p button) args)))))
-            (when (= i active)
-              (setf (toggle-button-active-p button) t))
-            (incf i)
-            button)))
-     specs)))
-
-
 (defun adjustment-new (value lower upper step-increment page-increment page-size)
   (make-instance 'adjustment 
    :value value :lower lower :upper upper :step-increment step-increment
    :page-increment page-increment :page-size page-size))
 
+(defun make-radio-group (type specs callback &rest initargs)
+  (let* ((active ())
+        (widgets
+         (loop
+          for spec in specs
+          as widget = (apply #'make-instance type (append spec initargs))
+          do (when callback
+              (apply #'add-activate-callback widget (mklist callback)))
+             (when (and (not active) (getf spec :active))
+               (setq active widget))
+         collect widget)))
+
+    (let ((active (or active (first widgets))))
+      (loop
+       for widget in widgets
+       unless (eq widget active)
+       do (add-to-radio-group widget active))
+      (signal-emit active 'clicked))
+
+    widgets))
+
+
+;;;; The follwing code will probably be removed soon
+
 (defun create-action (name &optional stock-id label accelerator tooltip 
                      callback &rest initargs)
   (let ((action (apply #'make-instance 'action
                 :name (string name) :stock-id stock-id  :label label
                 :tooltip tooltip :accelerator accelerator initargs)))
     (when callback
-      (signal-connect action 'activate callback))
+      (apply #'signal-connect action 'activate (mklist callback)))
     action))
 
 (defun create-toggle-action (name &optional stock-id label accelerator 
@@ -107,10 +97,17 @@ (defun create-toggle-action (name &optional stock-id label accelerator
                 :tooltip tooltip :active active :accelerator accelerator
                 initargs)))
     (when callback
-      (signal-connect action 'activate
-       #'(lambda ()
-          (funcall callback (toggle-action-active-p action))))
-      (funcall callback active))
+      (destructuring-bind (function &key object after) (mklist callback)
+       (signal-connect action 'activate
+        (if object 
+            #'(lambda (object)
+                (funcall function object (toggle-action-active-p action)))
+          #'(lambda ()
+              (funcall function (toggle-action-active-p action))))
+        :object object :after after)
+       ;(funcall callback active)
+       (when active
+         (action-activate action))))
     action))
 
 (defun create-radio-actions (specs &optional active callback &rest initargs)