Converted deprecated widgets option-menu and combo to combo-box and combo-box-entry

[clg] / glib / gboxed.lisp

diff --git a/glib/gboxed.lisp b/glib/gboxed.lisp
index 11a0f8095306bc073eb0acd0e495f5f6531f2429..41f62431216d2206d661fd7b980b0b3e7b23727a 100644 (file)
--- a/glib/gboxed.lisp
+++ b/glib/gboxed.lisp
@@ -15,38 +15,36 @@
 ;; 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: gboxed.lisp,v 1.4 2001-05-29 15:46:17 espen Exp $
+;; $Id: gboxed.lisp,v 1.12 2004-11-07 21:41:35 espen Exp $
 
 (in-package "GLIB")
 
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass boxed (proxy)
-    ()
-    (:metaclass proxy-class)
-    (:copy %boxed-copy)
-    (:free %boxed-free)))
+  (init-types-in-library #.(concatenate 'string
+                         (pkg-config:pkg-variable "glib-2.0" "libdir")
+                         "/libgobject-2.0.so")))
 
-(defbinding %boxed-copy (type location) pointer
-  ((find-type-number type) type-number)
-  (location pointer))
-
-(defbinding %boxed-free (type location) nil
-  ((find-type-number type) type-number)
-  (location pointer))
+(defclass boxed (struct)
+  ()
+  (:metaclass struct-class))
 
 
 ;;;; Metaclass for boxed classes
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass boxed-class (proxy-class)))
+  (defclass boxed-class (struct-class)
+    ())
+
+  (defmethod validate-superclass ((class boxed-class) (super standard-class))
+    (subtypep (class-name super) 'boxed)))
 
 
 (defmethod shared-initialize ((class boxed-class) names
                              &rest initargs &key name alien-name)
   (declare (ignore initargs names))
   (call-next-method)
-
+  
   (let* ((class-name (or name (class-name class)))
         (type-number
          (find-type-number
@@ -54,9 +52,19 @@ (defmethod shared-initialize ((class boxed-class) names
     (register-type class-name type-number)))
 
 
-(defmethod validate-superclass
-    ((class boxed-class) (super pcl::standard-class))
-  (subtypep (class-name super) 'boxed))
+(defbinding %boxed-copy (type location) pointer
+  ((find-type-number type) type-number)
+  (location pointer))
+
+(defbinding %boxed-free (type location) nil
+  ((find-type-number type) type-number)
+  (location pointer))
+
+(defmethod reference-foreign ((class boxed-class) location)
+  (%boxed-copy (class-name class) location))
+
+(defmethod unreference-foreign ((class boxed-class) location)
+  (%boxed-free (class-name class) location))
 
 
 ;;;; 
@@ -67,35 +75,35 @@ (defun expand-boxed-type (type-number &optional slots)
      (:metaclass boxed-class)
      (:alien-name ,(find-type-name type-number))))
 
-(register-derivable-type 'boxed "GBoxed" :expand 'expand-boxed-type)
+(register-derivable-type 'boxed "GBoxed" 'expand-boxed-type)
 
 ;;;; Special boxed types
 
-(defclass gstring (boxed)
-  ()
-  (:metaclass boxed-class)
-  (:alien-name "GString"))
-
-(deftype-method translate-from-alien
-    gstring (type-spec location &optional weak-ref)
-  `(let ((location ,location))
-     (unless (null-pointer-p location)
-       (prog1
-          (c-call::%naturalize-c-string location)
-        ,(unless weak-ref
-           (unreference-alien type-spec location))))))
-
-(deftype-method translate-to-alien
-    gstring (type-spec string &optional weak-ref)
-  (declare (ignore type-spec weak-ref))
-  `(let ((string ,string))
-     ;; Always copy strings to prevent seg fault due to GC
-     (funcall
-      ',(proxy-class-copy (find-class type-spec))
-      ',type-spec
-      (make-pointer (1+ (kernel:get-lisp-obj-address string))))))
-
-(deftype-method cleanup-alien gstring (type-spec c-string &optional weak-ref)
-  (when weak-ref
-    (unreference-alien type-spec c-string)))
+;; (defclass gstring (boxed)
+;;   ()
+;;   (:metaclass boxed-class)
+;;   (:alien-name "GString"))
+
+;; (deftype-method translate-from-alien
+;;     gstring (type-spec location &optional weak-ref)
+;;   `(let ((location ,location))
+;;      (unless (null-pointer-p location)
+;;        (prog1
+;;        (c-call::%naturalize-c-string location)
+;;      ,(unless weak-ref
+;;         (unreference-alien type-spec location))))))
+
+;; (deftype-method translate-to-alien
+;;     gstring (type-spec string &optional weak-ref)
+;;   (declare (ignore weak-ref))
+;;   `(let ((string ,string))
+;;      ;; Always copy strings to prevent seg fault due to GC
+;;      (funcall
+;;       ',(proxy-class-copy (find-class type-spec))
+;;       ',type-spec
+;;       (make-pointer (1+ (kernel:get-lisp-obj-address string))))))
+
+;; (deftype-method cleanup-alien gstring (type-spec c-string &optional weak-ref)
+;;   (when weak-ref
+;;     (unreference-alien type-spec c-string)))