Merge branch 'andy128k'

diff --git a/gtk/gtk.clipboard.lisp b/gtk/gtk.clipboard.lisp
index 846e107..269d1db 100644 (file)
--- a/gtk/gtk.clipboard.lisp
+++ b/gtk/gtk.clipboard.lisp
@@ -10,3 +10,11 @@
 
 (export 'clipboard-set-text)
 
+(defcfun gtk-clipboard-clear :void
+  (clipboard g-object))
+
+(defun clipboard-clear (clipboard)
+  (gtk-clipboard-clear clipboard))
+
+(export 'clipboard-clear)
+

diff --git a/gtk/gtk.menu.lisp b/gtk/gtk.menu.lisp
index 7ddd0f8..a316e21 100644 (file)
--- a/gtk/gtk.menu.lisp
+++ b/gtk/gtk.menu.lisp
@@ -44,7 +44,7 @@
         (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)
 

diff --git a/gtk/gtk.tree-model-filter.lisp b/gtk/gtk.tree-model-filter.lisp
index e74abee..d026bc4 100644 (file)
--- a/gtk/gtk.tree-model-filter.lisp
+++ b/gtk/gtk.tree-model-filter.lisp
@@ -37,15 +37,30 @@ void          gtk_tree_model_filter_set_modify_func            (GtkTreeModelFilt
                                                                 GtkTreeModelFilterModifyFunc  func,
                                                                 gpointer                      data,
                                                                 GDestroyNotify                destroy);
+|#
+
+(defcfun gtk-tree-model-filter-set-visible-column :void
+  (filter (g-object tree-model-filter))
+  (column :int))
 
-void          gtk_tree_model_filter_set_visible_column         (GtkTreeModelFilter           *filter,
-                                                                gint                          column);
+(defun tree-model-filter-set-visible-column (filter column)
+  (gtk-tree-model-filter-set-visible-column filter column))
 
-/* conversion */
-gboolean      gtk_tree_model_filter_convert_child_iter_to_iter (GtkTreeModelFilter           *filter,
-                                                                GtkTreeIter                  *filter_iter,
-                                                                GtkTreeIter                  *child_iter);
-|#
+(export 'tree-model-filter-set-visible-column)
+
+;; conversion
+
+(defcfun gtk-tree-model-filter-convert-child-iter-to-iter :boolean
+  (filter (g-object tree-model-filter))
+  (filter-iter (g-boxed-foreign tree-iter))
+  (child-iter (g-boxed-foreign tree-iter)))
+
+(defun tree-model-filter-convert-child-iter-to-iter (filter iter)
+  (let ((filter-iter (make-instance 'tree-iter)))
+    (when (gtk-tree-model-filter-convert-child-iter-to-iter filter filter-iter iter)
+      filter-iter)))
+
+(export 'tree-model-filter-convert-child-iter-to-iter)
 
 (defcfun gtk-tree-model-filter-convert-iter-to-child-iter :void
   (filter (g-object tree-model-filter))
@@ -59,13 +74,23 @@ gboolean      gtk_tree_model_filter_convert_child_iter_to_iter (GtkTreeModelFilt
 
 (export 'tree-model-filter-convert-iter-to-child-iter)
 
-#|
-GtkTreePath  *gtk_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter           *filter,
-                                                                GtkTreePath                  *child_path);
+(defcfun gtk-tree-model-filter-convert-child-path-to-path (g-boxed-foreign tree-path :return)
+  (filter (g-object tree-model-sort))
+  (child-path (g-boxed-foreign tree-path)))
 
-GtkTreePath  *gtk_tree_model_filter_convert_path_to_child_path (GtkTreeModelFilter           *filter,
-                                                                GtkTreePath                  *filter_path);
-|#
+(defun tree-model-filter-convert-child-path-to-path (filter child-path)
+  (gtk-tree-model-filter-convert-child-path-to-path))
+
+(export 'tree-model-filter-convert-child-path-to-path)
+
+(defcfun gtk-tree-model-filter-convert-path-to-child-path (g-boxed-foreign tree-path :return)
+  (filter (g-object tree-model-sort))
+  (filter-path (g-boxed-foreign tree-path)))
+
+(defun tree-model-filter-convert-path-to-child-path (filter child-path)
+  (gtk-tree-model-filter-convert-path-to-child-path))
+
+(export 'tree-model-filter-convert-path-to-child-path)
 
 ;; extras