X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/7ce4015bab6f4366baf5b9321fb3fad094625305..f669d557d2ed78a18912095334a31fb9796e4231:/gtk/gtkaction.lisp

diff --git a/gtk/gtkaction.lisp b/gtk/gtkaction.lisp
index c004acd..4ffce9e 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.7 2006-02-05 12:54:55 espen Exp $
+;; $Id: gtkaction.lisp,v 1.10 2006-08-14 13:57:37 espen Exp $
 
 
 (in-package "GTK")
@@ -33,7 +33,7 @@
     (apply #'signal-connect action 'activate (mklist callback))))
 
 (defmethod action-accelerator ((action action))
-  (object-data action 'accelerator))
+  (user-data action 'accelerator))
 
 (defbinding (action-is-sensitive-p "gtk_action_is_sensitive") () boolean
   (action action))
@@ -85,7 +85,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 +118,7 @@
 
 ;;; 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 @@
 	 #'(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
@@ -180,24 +180,20 @@
   (ui-manager ui-manager)
   (ui string)
   ((length ui) int)
-  (gerror pointer :out))
+  (gerror gerror-signal :out))
+
+(defgeneric ui-manager-add-ui (ui-manager ui-spec))
 
 (defmethod ui-manager-add-ui ((ui-manager ui-manager) (ui-spec string))
-  (let ((id (%ui-manager-add-ui-from-string ui-manager ui-spec)))
-    (when (zerop id)
-      (error "We need to handle GError in som way"))
-    id))
+  (%ui-manager-add-ui-from-string ui-manager ui-spec))
 
 (defbinding %ui-manager-add-ui-from-file () int
   (ui-manager ui-manager)
   (filename pathname)
-  (gerror pointer :out))
+  (gerror gerror-signal :out))
 
 (defmethod ui-manager-add-ui ((ui-manager ui-manager) (path pathname))
-  (let ((id (%ui-manager-add-ui-from-file ui-manager path)))
-    (when (zerop id)
-      (error "We need to handle GError in som way"))
-    id))
+  (%ui-manager-add-ui-from-file ui-manager path))
 
 (defbinding %ui-manager-new-merge-id () unsigned-int
   (ui-manager ui-manager))