From 985e4aa3499bc76f0f44eb157e26736166e557fb Mon Sep 17 00:00:00 2001 Message-Id: <985e4aa3499bc76f0f44eb157e26736166e557fb.1717397562.git.mdw@distorted.org.uk> From: Mark Wooding Date: Fri, 3 Feb 2006 00:10:56 +0000 Subject: [PATCH] Added dependency for Gtk 2.8 for toggle references Organization: Straylight/Edgeware From: espen --- glib/gobject.lisp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/glib/gobject.lisp b/glib/gobject.lisp index 2f447fb..486f870 100644 --- a/glib/gobject.lisp +++ b/glib/gobject.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. -;; $Id: gobject.lisp,v 1.38 2006/02/02 22:35:12 espen Exp $ +;; $Id: gobject.lisp,v 1.39 2006/02/03 00:10:56 espen Exp $ (in-package "GLIB") @@ -66,11 +66,13 @@ (defcallback toggle-ref-callback (nil (data pointer) (location pointer) (last-re (cache-instance (find-cached-instance location) t) (cache-instance (find-cached-instance location) nil))) +#+gtk2.8 (defbinding %object-add-toggle-ref () pointer (location pointer) ((callback toggle-ref-callback) pointer) (nil null)) +#+gtk2.8 (defbinding %object-remove-toggle-ref () pointer (location pointer) ((callback toggle-ref-callback) pointer) @@ -78,9 +80,12 @@ (defbinding %object-remove-toggle-ref () pointer (defmethod reference-foreign ((class gobject-class) location) (declare (ignore class)) + #+gtk2.8 (if (slot-value class 'instance-slots-p) (%object-add-toggle-ref location) - (%object-ref location))) + (%object-ref location)) + #-gtk2.8 + (%object-ref location)) (defmethod unreference-foreign ((class gobject-class) location) (declare (ignore class)) @@ -264,13 +269,18 @@ (defmethod initialize-instance ((object gobject) &rest initargs) (defmethod instance-finalizer ((instance gobject)) (let ((location (proxy-location instance))) + #+gtk2.8 (if (slot-value (class-of instance) 'instance-slots-p) #'(lambda () (remove-cached-instance location) (%object-remove-toggle-ref location)) #'(lambda () (remove-cached-instance location) - (%object-unref location))))) + (%object-unref location))) + #-gtk2.8 + #'(lambda () + (remove-cached-instance location) + (%object-unref location)))) (defbinding (%gobject-new "g_object_new") () pointer -- [mdw]