X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk%2Fgtk.ui-manager.lisp;h=8e501bd3034f19846dbcf291b52a0d99a7019ccb;hb=eadf2b7a4f39e93b50debf05a0925786615564d7;hp=d7af2640b38ae3d3db3c9ccff8757c1999811b1d;hpb=b638875984a67b3c43341cdf17607d981c7903ae;p=cl-gtk2.git

diff --git a/gtk/gtk.ui-manager.lisp b/gtk/gtk.ui-manager.lisp
index d7af264..8e501bd 100644
--- a/gtk/gtk.ui-manager.lisp
+++ b/gtk/gtk.ui-manager.lisp
@@ -42,10 +42,9 @@
   (length gssize)
   (error :pointer))
 
-; TODO: add handling of error
-
 (defun ui-manager-add-ui-from-string (ui-manager string)
-  (gtk-ui-manager-add-ui-from-string ui-manager string -1 (null-pointer)))
+  (with-g-error (err)
+    (gtk-ui-manager-add-ui-from-string ui-manager string -1 err)))
 
 (export 'ui-manager-add-ui-from-string)
 
@@ -55,7 +54,8 @@
   (error :pointer))
 
 (defun ui-manager-add-ui-from-file (ui-manager file-name)
-  (gtk-ui-manager-add-ui-from-file ui-manager file-name (null-pointer)))
+  (with-g-error (err)
+    (gtk-ui-manager-add-ui-from-file ui-manager file-name err)))
 
 (export 'ui-manager-add-ui-from-file)
 
@@ -92,7 +92,7 @@
 
 (export 'action-group-action)
 
-(defcfun (action-group-actions "gtk_action_group_actions") (glist g-object :free-from-foreign t)
+(defcfun (action-group-actions "gtk_action_group_list_actions") (glist g-object :free-from-foreign t)
   (action-group g-object))
 
 (export 'action-group-actions)
@@ -107,11 +107,11 @@
 
 (export 'action-group-add-action)
 
-(defcfun (action-remove-action "gtk_action_remove_action") :void
+(defcfun (action-group-remove-action "gtk_action_group_remove_action") :void
   (action-group g-object)
   (action g-object))
 
-(export 'action-remove-action)
+(export 'action-group-remove-action)
 
 (defcallback gtk-translate-func-callback (:string :free-to-foreign nil :free-from-foreign nil)
     ((path (:string :free-from-foreign nil)) (data :pointer))
@@ -158,12 +158,12 @@
 
 (export 'action-create-icon)
 
-(defcfun (action-create-menu-item "gtk_action_create_menu-item") g-object
+(defcfun (action-create-menu-item "gtk_action_create_menu_item") g-object
   (action g-object))
 
 (export 'action-create-menu-item)
 
-(defcfun (action-create-tool-item "gtk_action_create_tool-item") g-object
+(defcfun (action-create-tool-item "gtk_action_create_tool_item") g-object
   (action g-object))
 
 (export 'action-create-tool-item)
@@ -200,6 +200,16 @@
 
 (export 'action-disconnect-accelerator)
 
+(defcfun (action-block-activate "gtk_action_block_activate") :void
+  (action (g-object action)))
+
+(export 'action-block-activate)
+
+(defcfun (action-unblock-activate "gtk_action_unblock_activate") :void
+  (action (g-object action)))
+
+(export 'action-unblock-activate)
+
 (defcfun (action-block-activate-from "gtk_action_block_activate_from") :void
   (action g-object)
   (proxy g-object))
@@ -210,4 +220,9 @@
   (action g-object)
   (proxy g-object))
 
-(export 'action-unblock-activate-from)
\ No newline at end of file
+(export 'action-unblock-activate-from)
+
+(defcfun (radio-action-get-group "gtk_radio_action_get_group") (gslist (g-object radio-action) :free-from-foreign nil)
+  (action (g-object radio-action)))
+
+(export 'radio-action-get-group)