X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/034ff0423c2a80734ae57491817fbce041e6a5d8..d71326a2a619ac213d90dcc522a1354e37ce8e30:/gtk/gtkaction.lisp

diff --git a/gtk/gtkaction.lisp b/gtk/gtkaction.lisp
index 9dff11c..f93927a 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.8 2006-02-28 16:30:37 espen Exp $
+;; $Id: gtkaction.lisp,v 1.11 2007-01-14 23:22:19 espen Exp $
 
 
 (in-package "GTK")
@@ -32,9 +32,6 @@
   (when callback
     (apply #'signal-connect action 'activate (mklist callback))))
 
-(defmethod action-accelerator ((action action))
-  (object-data action 'accelerator))
-
 (defbinding (action-is-sensitive-p "gtk_action_is_sensitive") () boolean
   (action action))
 
@@ -85,7 +82,7 @@
 
 (defmethod initialize-instance ((action radio-action) &key group)
   (call-next-method)
-  (setf (slot-value action 'self) (sap-int (foreign-location action)))
+  (setf (slot-value action 'self) (pointer-address (foreign-location action)))
   (when group
     (add-to-radio-group action group)))
 
@@ -118,7 +115,7 @@
 
 ;;; Toggle Action
 
-(defmethod initialize-instance ((action toggle-action) &rest initargs &key callback)
+(defmethod initialize-instance ((action toggle-action) &rest initargs &key callback #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")active)
   (remf initargs :callback)
   (apply #'call-next-method action initargs)
   (when callback
@@ -130,7 +127,8 @@
 	 #'(lambda ()
 	     (funcall function (toggle-action-active-p action))))
        :object object :after after)))
-  (when (toggle-action-active-p action)
+  #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
+  (when active
     (action-activate action)))
 
 (defbinding toggle-action-toggled () nil