X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/8d438a354b13a1c433b24ea200855ae6a4361fef..c0ede95392287d12cd6299afd7c27e896d036151:/gtk/gtkutils.lisp

diff --git a/gtk/gtkutils.lisp b/gtk/gtkutils.lisp
index 1166f15..59e20d3 100644
--- a/gtk/gtkutils.lisp
+++ b/gtk/gtkutils.lisp
@@ -1,21 +1,26 @@
-;; Common Lisp bindings for GTK+ v2.0
-;; Copyright (C) 1999-2000 Espen S. Johnsen <espejohn@online.no>
+;; Common Lisp bindings for GTK+ v2.x
+;; Copyright 1999-2005 Espen S. Johnsen <espen@users.sf.net>
 ;;
-;; This library is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU Lesser General Public
-;; License as published by the Free Software Foundation; either
-;; version 2 of the License, or (at your option) any later version.
+;; Permission is hereby granted, free of charge, to any person obtaining
+;; a copy of this software and associated documentation files (the
+;; "Software"), to deal in the Software without restriction, including
+;; without limitation the rights to use, copy, modify, merge, publish,
+;; distribute, sublicense, and/or sell copies of the Software, and to
+;; permit persons to whom the Software is furnished to do so, subject to
+;; the following conditions:
 ;;
-;; This library is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; Lesser General Public License for more details.
+;; The above copyright notice and this permission notice shall be
+;; included in all copies or substantial portions of the Software.
 ;;
-;; You should have received a copy of the GNU Lesser General Public
-;; License along with this library; if not, write to the Free Software
-;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+;; IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtkutils.lisp,v 1.6 2005-01-06 21:06:54 espen Exp $
+;; $Id: gtkutils.lisp,v 1.8 2005-04-23 16:48:52 espen Exp $
 
 
 (in-package "GTK")
@@ -74,63 +79,6 @@ (defun make-radio-group (type specs callback &rest initargs)
        for widget in widgets
        unless (eq widget active)
        do (add-to-radio-group widget active))
-      (signal-emit active 'clicked))
+      (activate-radio-widget active))
 
     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
-      (apply #'signal-connect action 'activate (mklist callback)))
-    action))
-
-(defun create-toggle-action (name &optional stock-id label accelerator 
-			     tooltip active callback &rest initargs)
-  (let ((action (apply #'make-instance 'toggle-action 
-		 :name (string name) :stock-id stock-id :label label
-		 :tooltip tooltip :active active :accelerator accelerator
-		 initargs)))
-    (when callback
-      (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)
-  (loop
-   with group = nil
-   for spec in specs
-   collect (destructuring-bind (name &optional stock-id label accelerator 
-				tooltip (value name)) 
-	       (mklist spec)
-	     (let ((action (apply #'make-instance 'radio-action 
-			    :name (string name) :stock-id stock-id 
-			    :label label :tooltip tooltip 
-			    :accelerator accelerator initargs)))
-	       (when (equal active value)
-		 (setf (toggle-action-active-p action) t)
-		 (when callback
-		   (funcall callback value)))
-
-	       (if (not group)
-		   (setq group action)
-		 (radio-action-add-to-group action group))
-	       (when callback
-		 (signal-connect action 'activate
-		  #'(lambda ()
-		      (funcall callback value))))
-	       action))))