Inherit from REF-COUNTED-OBJECT

diff --git a/cairo/cairo.lisp b/cairo/cairo.lisp
index 75452a2e18c4610185344374b5d4a0f23704e1c6..45a37fb5630ee89e40aec73b556dc3c1c9014424 100644 (file)
--- a/cairo/cairo.lisp
+++ b/cairo/cairo.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: cairo.lisp,v 1.8 2007-01-11 10:20:22 espen Exp $
+;; $Id: cairo.lisp,v 1.9 2007-01-12 10:32:43 espen Exp $

 
 (in-package "CAIRO")
 
 
 (in-package "CAIRO")
 


@@ -77,13 +77,13 @@   (defclass glyph (struct)
       :type double-float))
     (:metaclass struct-class))
 
       :type double-float))
     (:metaclass struct-class))
 

-  (defclass font-face (proxy)
+  (defclass font-face (ref-counted-object)

     ()
     (:metaclass proxy-class)
     (:ref %font-face-reference)
     (:unref %font-face-destroy))
 
     ()
     (:metaclass proxy-class)
     (:ref %font-face-reference)
     (:unref %font-face-destroy))
 

-  (defclass font-options (proxy)
+  (defclass font-options (ref-counted-object)

     ((antialias
       :allocation :virtual 
       :getter "font_options_get_antialias"
     ((antialias
       :allocation :virtual 
       :getter "font_options_get_antialias"


@@ -112,7 +112,7 @@   (defclass font-options (proxy)
     (:ref %font-options-reference)
     (:unref %font-options-destroy))
 
     (:ref %font-options-reference)
     (:unref %font-options-destroy))
 

-  (defclass scaled-font (proxy)
+  (defclass scaled-font (ref-counted-object)

     ()
     (:metaclass proxy-class)
     (:ref %scaled-font-reference)
     ()
     (:metaclass proxy-class)
     (:ref %scaled-font-reference)


@@ -143,7 +143,7 @@   (defclass text-extents (struct)
      (y-advance :allocation :alien :reader text-extents-y-advance :type double-float))
     (:metaclass struct-class))
 
      (y-advance :allocation :alien :reader text-extents-y-advance :type double-float))
     (:metaclass struct-class))
 

-  (defclass pattern (proxy)
+  (defclass pattern (ref-counted-object)

     ((extend
       :allocation :virtual 
       :getter "cairo_pattern_get_extend"
     ((extend
       :allocation :virtual 
       :getter "cairo_pattern_get_extend"


@@ -167,7 +167,7 @@   (defclass pattern (proxy)
     (:unref %pattern-destroy))
 
 
     (:unref %pattern-destroy))
 
 

-  (defclass surface (proxy)
+  (defclass surface (ref-counted-object)

     (#?(pkg-exists-p "cairo" :atleast-version "1.2")
      (type
       :allocation :virtual 
     (#?(pkg-exists-p "cairo" :atleast-version "1.2")
      (type
       :allocation :virtual 


@@ -184,7 +184,7 @@   (defclass surface (proxy)
     (:ref %surface-reference)
     (:unref %surface-destroy))
 
     (:ref %surface-reference)
     (:unref %surface-destroy))
 

-  (defclass context (proxy)
+  (defclass context (ref-counted-object)

     ((target
       :allocation :virtual 
       :getter "cairo_get_target"
     ((target
       :allocation :virtual 
       :getter "cairo_get_target"


@@ -284,9 +284,7 @@   (defclass image-surface (surface)
       :getter "cairo_image_surface_get_height"
       :reader surface-height
       :type int))
       :getter "cairo_image_surface_get_height"
       :reader surface-height
       :type int))

-    (:metaclass proxy-class)
-    (:ref %surface-reference)
-    (:unref %surface-destroy))
+    (:metaclass proxy-class))

 
 
 ;;   (defclass path (proxy)
 
 
 ;;   (defclass path (proxy)

diff --git a/glib/gtype.lisp b/glib/gtype.lisp
index 4b411e461061342eba8ef76f1e736853f107e93f..0de8bbd7be4ae886032a0963b84e1be706b74fc4 100644 (file)
--- a/glib/gtype.lisp
+++ b/glib/gtype.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: gtype.lisp,v 1.59 2007-01-02 18:39:42 espen Exp $
+;; $Id: gtype.lisp,v 1.60 2007-01-12 10:32:43 espen Exp $

 
 (in-package "GLIB")
 
 
 (in-package "GLIB")
 


@@ -368,7 +368,7 @@ (defmethod validate-superclass ((class ginstance-class) (super standard-class))
 ;;;; Superclass for wrapping types in the glib type system
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 ;;;; Superclass for wrapping types in the glib type system
 
 (eval-when (:compile-toplevel :load-toplevel :execute)

-  (defclass ginstance (proxy)
+  (defclass ginstance (ref-counted-object)

     (;(class :allocation :alien :type pointer :offset 0)
      )
     (:metaclass proxy-class)
     (;(class :allocation :alien :type pointer :offset 0)
      )
     (:metaclass proxy-class)


@@ -400,12 +400,6 @@ (defmethod make-proxy-instance :around ((class ginstance-class) location
       (error "Object at ~A has an unkown type number: ~A"
        location (%type-number-of-ginstance location)))))
 
       (error "Object at ~A has an unkown type number: ~A"
        location (%type-number-of-ginstance location)))))
 

-(define-type-method from-alien-form ((type ginstance) form &key (ref :copy))
-  (call-next-method type form :ref ref))
-
-(define-type-method from-alien-function ((type ginstance) &key (ref :copy))
-  (call-next-method type :ref ref))
-

 
 ;;;; Registering fundamental types
 
 
 ;;;; Registering fundamental types