X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/7be9fc0c9889a4bfaada6ec16e631dee2f024934..cc74b2c987edc3e2bc85413e92f33e2690a32b1c:/gdk/gdk.lisp

diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp
index 168ec86..6528895 100644
--- a/gdk/gdk.lisp
+++ b/gdk/gdk.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: gdk.lisp,v 1.18 2005-11-10 09:01:36 espen Exp $
+;; $Id: gdk.lisp,v 1.20 2006-02-08 22:20:22 espen Exp $
 
 
 (in-package "GDK")
@@ -425,7 +425,7 @@ (defbinding rgb-init () nil)
 (defmethod initialize-instance ((cursor cursor) &key type mask fg bg 
 				(x 0) (y 0) (display (display-get-default)))
   (setf 
-   (slot-value cursor 'location)
+   (foreign-location cursor)
    (etypecase type
      (keyword (%cursor-new-for-display display type))
      (pixbuf (%cursor-new-from-pixbuf display type x y))
@@ -712,6 +712,13 @@ (progn
   (defbinding cairo-create () cairo:context
     (drawable drawable))
 
+  (defmacro with-cairo-context ((cr drawable) &body body)
+    `(let ((,cr (cairo-create ,drawable)))
+       (unwind-protect
+	   (progn ,@body)
+	 (unreference-foreign 'cairo:context (foreign-location ,cr))
+	 (invalidate-instance ,cr))))
+
   (defbinding cairo-set-source-color () nil
     (cr cairo:context)
     (color color))