From 88cb085461bbe845749f2b4f9bc840e136160ffc Mon Sep 17 00:00:00 2001 From: Dmitry Kalyanov Date: Tue, 9 Mar 2010 22:37:39 +0300 Subject: [PATCH] Clean up after merge --- gtk/gtk.clipboard.lisp | 9 +++------ gtk/gtk.tree-model-filter.lisp | 25 +++++-------------------- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/gtk/gtk.clipboard.lisp b/gtk/gtk.clipboard.lisp index 269d1db..9dc244f 100644 --- a/gtk/gtk.clipboard.lisp +++ b/gtk/gtk.clipboard.lisp @@ -1,7 +1,7 @@ (in-package :gtk) (defcfun gtk-clipboard-set-text :void - (clipboard g-object) + (clipboard (g-object clipboard)) (text :string) (len :int)) @@ -10,11 +10,8 @@ (export 'clipboard-set-text) -(defcfun gtk-clipboard-clear :void - (clipboard g-object)) - -(defun clipboard-clear (clipboard) - (gtk-clipboard-clear clipboard)) +(defcfun (clipboard-clear "gtk_clipboard_clear") :void + (clipboard (g-object clipboard))) (export 'clipboard-clear) diff --git a/gtk/gtk.tree-model-filter.lisp b/gtk/gtk.tree-model-filter.lisp index d026bc4..d2af653 100644 --- a/gtk/gtk.tree-model-filter.lisp +++ b/gtk/gtk.tree-model-filter.lisp @@ -39,13 +39,10 @@ void gtk_tree_model_filter_set_modify_func (GtkTreeModelFilt GDestroyNotify destroy); |# -(defcfun gtk-tree-model-filter-set-visible-column :void +(defcfun (tree-model-filter-set-visible-column "gtk_tree_model_filter_set_visible_column") :void (filter (g-object tree-model-filter)) (column :int)) -(defun tree-model-filter-set-visible-column (filter column) - (gtk-tree-model-filter-set-visible-column filter column)) - (export 'tree-model-filter-set-visible-column) ;; conversion @@ -74,38 +71,26 @@ void gtk_tree_model_filter_set_modify_func (GtkTreeModelFilt (export 'tree-model-filter-convert-iter-to-child-iter) -(defcfun gtk-tree-model-filter-convert-child-path-to-path (g-boxed-foreign tree-path :return) +(defcfun (tree-model-filter-convert-child-path-to-path "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))) -(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) +(defcfun (tree-model-filter-convert-path-to-child-path "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 -(defcfun gtk-tree-model-filter-refilter :void +(defcfun (tree-model-filter-refilter "gtk_tree_model_filter_refilter") :void (filter (g-object tree-model-filter))) -(defun tree-model-filter-refilter (filter) - (gtk-tree-model-filter-refilter filter)) - (export 'tree-model-filter-refilter) -(defcfun gtk-tree-model-filter-clear-cache :void +(defcfun (tree-model-filter-clear-cache "gtk_tree_model_filter_clear_cache") :void (filter (g-object tree-model-filter))) -(defun tree-model-filter-clear-cache (filter) - (gtk-tree-model-filter-clear-cache filter)) - (export 'tree-model-filter-clear-cache) -- 1.7.10.4