Added pseudo type COPY-OF

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 24d9ff27f19328f7e8fc35d8640ad763c336ea4b..6299f2c76784d0f2d4eff27e2934002eb97bf2b6 100644 (file)
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.lisp
@@ -15,14 +15,14 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

-;; $Id: gtk.lisp,v 1.17 2004/11/07 17:55:29 espen Exp $
+;; $Id: gtk.lisp,v 1.18 2004/11/19 13:09:00 espen Exp $

 
 
 (in-package "GTK")
 
 ;;; Gtk version
 
 
 
 (in-package "GTK")
 
 ;;; Gtk version
 

-(defbinding check-version () string
+(defbinding check-version () (copy-of string)

   (required-major unsigned-int)
   (required-minor unsigned-int)
   (required-micro unsigned-int))
   (required-major unsigned-int)
   (required-minor unsigned-int)
   (required-micro unsigned-int))


@@ -39,7 +39,7 @@ (defun gtk-version ()
        (format nil "Gtk+ v~A.~A" major minor) 
       (format nil "Gtk+ v~A.~A.~A" major minor micro))))
 
        (format nil "Gtk+ v~A.~A" major minor) 
       (format nil "Gtk+ v~A.~A.~A" major minor micro))))
 

-(defbinding get-default-language () string)
+(defbinding get-default-language () (copy-of pango:language))

 
 
 ;;;; Initalization
 
 
 ;;;; Initalization


@@ -271,7 +271,7 @@ (defmethod shared-initialize ((combo-box combo-box) names &key model content)
   (unless model
     (setf 
      (combo-box-model combo-box) 
   (unless model
     (setf 
      (combo-box-model combo-box) 

-     (make-instance 'list-store :columns '(string)))
+     (make-instance 'list-store :column-types '(string)))

     (unless (typep combo-box 'combo-box-entry)
       (let ((cell (make-instance 'cell-renderer-text)))
        (cell-layout-pack combo-box cell :expand t)
     (unless (typep combo-box 'combo-box-entry)
       (let ((cell (make-instance 'cell-renderer-text)))
        (cell-layout-pack combo-box cell :expand t)


@@ -457,7 +457,7 @@ (defmethod (setf container-children) (children (dialog dialog))
 
 ;;; Entry
 
 
 ;;; Entry
 

-(defbinding  entry-get-layout () pango:layout
+(defbinding  entry-get-layout () (copy-of pango:layout)

   (entry entry))
 
 (defbinding entry-get-layout-offsets () nil
   (entry entry))
 
 (defbinding entry-get-layout-offsets () nil


@@ -524,7 +524,7 @@ (defbinding label-select-region () nil
 (defbinding label-get-text () string
   (label label))
 
 (defbinding label-get-text () string
   (label label))
 

-(defbinding label-get-layout () pango:layout
+(defbinding label-get-layout () (copy-of pango:layout)

   (label label))
 
 (defbinding label-get-selection-bounds () boolean
   (label label))
 
 (defbinding label-get-selection-bounds () boolean


@@ -956,7 +956,7 @@ (defbinding (notebook-tab-label "gtk_notebook_get_tab_label")
   ((%notebook-child notebook page) widget))
 
 (defbinding (notebook-tab-label-text "gtk_notebook_get_tab_label_text")
   ((%notebook-child notebook page) widget))
 
 (defbinding (notebook-tab-label-text "gtk_notebook_get_tab_label_text")

-    (notebook page) string
+    (notebook page) (copy-of string)

   (notebook notebook)
   ((%notebook-child notebook page) widget))
 
   (notebook notebook)
   ((%notebook-child notebook page) widget))
 


@@ -979,7 +979,7 @@ (defbinding (notebook-menu-label "gtk_notebook_get_menu_label")
   ((%notebook-child notebook page) widget))
 
 (defbinding (notebook-menu-label-text "gtk_notebook_get_menu_label_text")
   ((%notebook-child notebook page) widget))
 
 (defbinding (notebook-menu-label-text "gtk_notebook_get_menu_label_text")

-    (notebook page) string
+    (notebook page) (copy-of string)

   (notebook notebook)
   ((%notebook-child notebook page) widget))
 
   (notebook notebook)
   ((%notebook-child notebook page) widget))
 


@@ -1499,7 +1499,7 @@ (defbinding progress-bar-pulse () nil
 
 (defbinding stock-lookup () boolean
   (stock-id string)
 
 (defbinding stock-lookup () boolean
   (stock-id string)

-  (stock-item stock-item :out))
+  ((make-instance 'stock-item) stock-item :return))