Infra: Rudimentary setup system.

[clg] / gtk / gtkselection.lisp

diff --git a/gtk/gtkselection.lisp b/gtk/gtkselection.lisp
index d28ea8b8cda178fbe2e53e36aad19bd0ddeb5b70..3a95cb521e7a59a3b6aa4bf32436d822003c69b1 100644 (file)
--- a/gtk/gtkselection.lisp
+++ b/gtk/gtkselection.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gtkselection.lisp,v 1.12 2007-12-13 14:29:59 espen Exp $
+;; $Id: gtkselection.lisp,v 1.15 2008-04-11 18:38:56 espen Exp $
 
 
 (in-package "GTK")
@@ -169,7 +169,7 @@ (defun selection-data-get-targets (selection-data)
   (multiple-value-bind (valid-p targets) 
       (%selection-data-get-targets selection-data) 
     (when valid-p
-      (map-into targets #'gdk:atom-name targets))))
+      (map 'vector #'gdk:atom-name targets))))
 
 #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
 (defbinding selection-data-targets-include-image-p (selection-data &optional writable-p) boolean
@@ -201,7 +201,7 @@ (define-callback %clipboard-clear-callback nil
   (declare (ignore clipboard))
   (funcall (cdr (find-user-data callback-ids))))
 
-;; Deprecated, use clipboard-set-content
+;; Deprecated, use clipboard-set-contents
 (defbinding clipboard-set-with-data (clipboard targets get-func clear-func) boolean
   (clipboard clipboard)
   (targets (vector (inlined target-entry)))
@@ -210,8 +210,8 @@ (defbinding clipboard-set-with-data (clipboard targets get-func clear-func) bool
   (%clipboard-clear-callback callback)
   ((register-user-data (cons get-func clear-func)) unsigned-int))
 
-(defun clipboard-set-content (clipboard targets get-func &optional clear-func)
-  (%clipboard-set-with-data clipboard (ensure-target-table targets) 
+(defun clipboard-set-contents (clipboard targets get-func &optional clear-func)
+  (clipboard-set-with-data clipboard (ensure-target-table targets) 
    get-func (or clear-func #'(lambda ()))))
 
 (defbinding clipboard-clear () nil
@@ -269,7 +269,7 @@ (define-callback %clipboard-targets-receive-callback nil
     ((clipboard pointer) (atoms (vector gdk:atom n-atoms))
      (n-atoms unsigned-int) (callback-id unsigned-int))
   (declare (ignore clipboard))
-  (funcall (find-user-data callback-id) (map-into atoms #'gdk:atom-name atoms)))
+  (funcall (find-user-data callback-id) (map 'vector #'gdk:atom-name atoms)))
 
 (defbinding clipboard-request-targets (clipboard callback) nil
   (clipboard clipboard)
@@ -303,7 +303,7 @@ (defun clipboard-wait-for-targets (clipboard)
   (multiple-value-bind (valid-p targets) 
       (%clipboard-wait-for-targets clipboard) 
     (when valid-p
-      (map-into targets #'gdk:atom-name targets))))
+      (map 'vector #'gdk:atom-name targets))))
 
 #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
 (defbinding clipboard-wait-is-target-available-p (clipboard target) boolean
@@ -461,7 +461,7 @@ (defbinding %drag-source-set-icon-pixbuf () nil
   
 (defbinding %drag-source-set-icon-stock () nil
   (widget widget)
-  (pixbuf gdk:pixbuf))
+  (stock-id string))
 
 (defun drag-source-set-icon (widget icon)
   (etypecase icon