Added some Gtk+ 2.10 stuff

[clg] / gtk / gtkaction.lisp

diff --git a/gtk/gtkaction.lisp b/gtk/gtkaction.lisp
index 21ca99301c0a087297974725458a691c5220ac85..9875222aa237b5f394b65100807a9b393f4c920a 100644 (file)
--- 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.10 2006/08/14 13:57:37 espen Exp $
+;; $Id: gtkaction.lisp,v 1.11 2007/01/14 23:22:19 espen Exp $
 
 
 (in-package "GTK")
@@ -32,9 +32,6 @@ (defmethod initialize-instance ((action action) &key callback)
   (when callback
     (apply #'signal-connect action 'activate (mklist callback))))
 
-(defmethod action-accelerator ((action action))
-  (user-data action 'accelerator))
-
 (defbinding (action-is-sensitive-p "gtk_action_is_sensitive") () boolean
   (action action))
 
@@ -118,7 +115,7 @@ (defun radio-action-get-current-value (action)
 
 ;;; Toggle Action
 
-(defmethod initialize-instance ((action toggle-action) &rest initargs &key callback active)
+(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,6 +127,7 @@ (defmethod initialize-instance ((action toggle-action) &rest initargs &key callb
         #'(lambda ()
             (funcall function (toggle-action-active-p action))))
        :object object :after after)))
+  #?-(pkg-exists-p "gtk+-2.0" :atleast-version "2.10.0")
   (when active
     (action-activate action)))