Disable SVG tests if librsvg is not available

[clg] / gtk / gtkobject.lisp

diff --git a/gtk/gtkobject.lisp b/gtk/gtkobject.lisp
index 821fa04709878d69d98232bf2a28d687803605fe..09e17462c6bdbbf93e36526fa8098dcc6113778f 100644 (file)
--- a/gtk/gtkobject.lisp
+++ b/gtk/gtkobject.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: gtkobject.lisp,v 1.27 2005/04/23 16:48:52 espen Exp $
+;; $Id: gtkobject.lisp,v 1.30 2006/02/08 21:57:26 espen Exp $

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


@@ -52,13 +52,15 @@   (defclass %object (gobject)
 (defmethod initialize-instance ((object %object) &rest initargs &key signal)
   (declare (ignore signal))
   (call-next-method)
 (defmethod initialize-instance ((object %object) &rest initargs &key signal)
   (declare (ignore signal))
   (call-next-method)

-  (reference-foreign (class-of object) (proxy-location object))

   (dolist (signal-definition (get-all initargs :signal))
     (apply #'signal-connect object signal-definition)))
 
 (defmethod initialize-instance :around ((object %object) &rest initargs)
   (declare (ignore initargs))
   (call-next-method)
   (dolist (signal-definition (get-all initargs :signal))
     (apply #'signal-connect object signal-definition)))
 
 (defmethod initialize-instance :around ((object %object) &rest initargs)
   (declare (ignore initargs))
   (call-next-method)

+  ;; Add a temorary reference which will be removed when the object is
+  ;; sinked
+  (reference-foreign (class-of object) (foreign-location object))

   (%object-sink object))
 
 (defbinding %object-sink () nil
   (%object-sink object))
 
 (defbinding %object-sink () nil


@@ -126,6 +128,8 @@ (defmethod compute-effective-slot-definition-initargs ((class child-class) direc
   (if (eq (most-specific-slot-value direct-slotds 'allocation) :property)
       (nconc 
        (list :pname (most-specific-slot-value direct-slotds 'pname))
   (if (eq (most-specific-slot-value direct-slotds 'allocation) :property)
       (nconc 
        (list :pname (most-specific-slot-value direct-slotds 'pname))

+       ;; Need this to prevent type type expansion in SBCL (>= 0.9.8)
+       (list :type (most-specific-slot-value direct-slotds 'type))

        (call-next-method))
     (call-next-method)))
 
        (call-next-method))
     (call-next-method)))