X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=gtk%2Fgtk.menu.lisp;h=a316e212db9a2a797e5c5b405a9ed96d5b7c5a21;hb=1f9c939a43d645eaf55e4d375f6b1b609dd1c5bd;hp=5c3df95e8b3a5444da035cadc3ebf76267171fa0;hpb=d84a621183073cc7ca23bbca5ec34371ae51f74e;p=cl-gtk2.git

diff --git a/gtk/gtk.menu.lisp b/gtk/gtk.menu.lisp
index 5c3df95..a316e21 100644
--- a/gtk/gtk.menu.lisp
+++ b/gtk/gtk.menu.lisp
@@ -38,13 +38,13 @@
                           (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
                         (callback gtk-menu-position-func-callback)
                         ptr button activate-time))
-      (gtk-menu-popup menu parent-menu-shell parent-menu-item (callback gtk-menu-position-func-callback) (null-pointer) (null-pointer) activate-time)))
+      (gtk-menu-popup menu parent-menu-shell parent-menu-item (null-pointer) (null-pointer) button activate-time)))
 
 (export 'menu-popup)
 
@@ -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)
@@ -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)))