X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk%2Fgtk.menu.lisp;h=7ddd0f81ca60111f05eb02ccd88d72288889dc29;hb=af5ce50499aa0db8d068c00e0a25d8a1334c1740;hp=ce031445f926fc29d546976b63a1c430f88ac5ad;hpb=ca504defb1fba77e974b84ba6df2468aa59242de;p=cl-gtk2.git

diff --git a/gtk/gtk.menu.lisp b/gtk/gtk.menu.lisp
index ce03144..7ddd0f8 100644
--- a/gtk/gtk.menu.lisp
+++ b/gtk/gtk.menu.lisp
@@ -38,7 +38,7 @@
                           (mem-ref y :int) 0
                           (mem-ref push-in :boolean) nil))))
 
-(defun menu-popup (menu &key parent-menu-shell parent-menu-item position-func (button 0) (activate-time (gtk-get-current-event-time)))
+(defun menu-popup (menu &key parent-menu-shell parent-menu-item position-func (button 0) (activate-time (current-event-time)))
   (if position-func
       (with-stable-pointer (ptr position-func)
         (gtk-menu-popup menu parent-menu-shell parent-menu-item
@@ -60,11 +60,22 @@
 
 ; TODO: gtk_menu_attach_to_widget
 
-; TODO: gtk_menu_detach
+(defcfun (menu-detach "gtk_menu_detach") :void
+  (menu (g-object menu)))
 
-; TODO: gtk_menu_get_attach_widget
+(export 'menu-detach)
 
-; TODO: gtk_menu_get_for_attach_widget
+; TODO: gtk_menu_get_attach_to_widget
+
+(defcfun (menu-attached-to-widget "gtk_menu_get_for_attach_widget") (glist (g-object menu) :free-from-foreign nil)
+  (width (g-object widget)))
+
+(export 'menu-attached-to-widget)
+
+(defcfun (tool-shell-rebuild-menu "gtk_tool_shell_rebuild_menu") :void
+  (shell (g-object tool-shell)))
+
+(export 'tool-shell-rebuild-menu)
 
 (defcfun (menu-shell-append "gtk_menu_shell_append") :void
   (menu-shell g-object)
@@ -134,7 +145,7 @@
 
 (export 'toolbar-insert)
 
-(defcfun (toolbar-item-index "gtk_toolbar_item_index") :int
+(defcfun (toolbar-item-index "gtk_toolbar_get_item_index") :int
   (toolbar g-object)
   (item g-object))
 
@@ -184,3 +195,6 @@
 
 (export 'tool-item-rebuild-menu)
 
+(defcfun (radio-tool-button-get-group "gtk_radio_tool_button_get_group")
+    (gslist (g-object radio-tool-button) :free-from-foreign nil)
+  (button (g-object radio-tool-button)))