From: espen <espen>
Date: Mon, 14 Aug 2006 13:57:37 +0000 (+0000)
Subject: Fixed toggle-action activation bug
X-Git-Tag: clg-0-93~282
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/commitdiff_plain/5481992b429fe5716673f6d35a72cfb139ec1ecf

Fixed toggle-action activation bug
---

diff --git a/gtk/gtkaction.lisp b/gtk/gtkaction.lisp
index 537a7cc..21ca993 100644
--- a/gtk/gtkaction.lisp
+++ b/gtk/gtkaction.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtkaction.lisp,v 1.9 2006/04/26 12:32:04 espen Exp $
+;; $Id: gtkaction.lisp,v 1.10 2006/08/14 13:57:37 espen Exp $
 
 
 (in-package "GTK")
@@ -118,7 +118,7 @@ (defun radio-action-get-current-value (action)
 
 ;;; Toggle Action
 
-(defmethod initialize-instance ((action toggle-action) &rest initargs &key callback)
+(defmethod initialize-instance ((action toggle-action) &rest initargs &key callback active)
   (remf initargs :callback)
   (apply #'call-next-method action initargs)
   (when callback
@@ -130,7 +130,7 @@ (defmethod initialize-instance ((action toggle-action) &rest initargs &key callb
 	 #'(lambda ()
 	     (funcall function (toggle-action-active-p action))))
        :object object :after after)))
-  (when (toggle-action-active-p action)
+  (when active
     (action-activate action)))
 
 (defbinding toggle-action-toggled () nil
diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 18d1923..645d1ba 100644
--- a/gtk/gtktypes.lisp
+++ b/gtk/gtktypes.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtktypes.lisp,v 1.48 2006/06/23 12:25:38 espen Exp $
+;; $Id: gtktypes.lisp,v 1.49 2006/08/14 13:57:37 espen Exp $
 
 (in-package "GTK")
 
@@ -998,7 +998,7 @@     (default-height :merge t :unbound -1)))
      :allocation :virtual
      :getter "gtk_toggle_action_get_active"
      :setter "gtk_toggle_action_set_active"
-     :initarg :active
+;     :initarg :active
      :accessor toggle-action-active-p
      :type boolean)))