Bug fixes

diff --git a/gtk/gtkselection.lisp b/gtk/gtkselection.lisp
index 1b7dfc5d55df17210ebaeb4f6817bd3feadc76f9..72a1d935ed3e9dbf9e299b4f79bb1c343a15f425 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.
 
 ;; 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.14 2008/01/02 16:01:17 espen Exp $
+;; $Id: gtkselection.lisp,v 1.15 2008/04/11 18:38:56 espen Exp $

 
 
 (in-package "GTK")
 
 
 (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
   (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
 
 #?(pkg-exists-p "gtk+-2.0" :atleast-version "2.6.0")
 (defbinding selection-data-targets-include-image-p (selection-data &optional writable-p) boolean


@@ -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))
     ((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)
 
 (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
   (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
 
 #?(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)
   
 (defbinding %drag-source-set-icon-stock () nil
   (widget widget)

-  (pixbuf gdk:pixbuf))
+  (stock-id string))

 
 (defun drag-source-set-icon (widget icon)
   (etypecase icon
 
 (defun drag-source-set-icon (widget icon)
   (etypecase icon

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index 9c0dcdae4460db26f97b59b55eeacba997acd187..d49b81e315a9658f2b1e44917914214b2fe8663e 100644 (file)
--- a/gtk/gtktypes.lisp
+++ b/gtk/gtktypes.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.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: gtktypes.lisp,v 1.62 2008/01/10 22:11:15 espen Exp $
+;; $Id: gtktypes.lisp,v 1.63 2008/04/11 18:40:23 espen Exp $

 
 (in-package "GTK")
 
 
 (in-package "GTK")
 


@@ -884,7 +884,7 @@     (default-height :merge t :unbound -1)))
      :allocation :virtual
      :getter "gtk_tree_view_get_columns"
      :reader tree-view-columns 
      :allocation :virtual
      :getter "gtk_tree_view_get_columns"
      :reader tree-view-columns 

-     :type (glist tree-view-column))
+     :type (glist (copy-of tree-view-column)))

     (selection
      :allocation :virtual
      :getter "gtk_tree_view_get_selection"
     (selection
      :allocation :virtual
      :getter "gtk_tree_view_get_selection"


@@ -1096,7 +1096,7 @@     (default-height :merge t :unbound -1)))
     (markup-column
      :allocation :virtual
      :getter %icon-view-get-markup-column
     (markup-column
      :allocation :virtual
      :getter %icon-view-get-markup-column

-     :setter %icon-view-set-tmarkup-column
+     :setter %icon-view-set-markup-column

      :boundp %icon-view-markup-column-boundp
      :initarg :markup-column
      :accessor icon-view-markup-column)
      :boundp %icon-view-markup-column-boundp
      :initarg :markup-column
      :accessor icon-view-markup-column)