Changed to use of settable FOREIGN-LOCATION

[clg] / gdk / gdk.lisp

diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp
index e0f15d1f3069338c6798d86c347f63900570126e..65288951f7a34bc76feec06d5c66a9bbe5204567 100644 (file)
--- 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.17 2005-04-23 16:48:50 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))
@@ -705,3 +705,35 @@ (defbinding (keyval-is-upper-p "gdk_keyval_is_upper") () boolean
 (defbinding (keyval-is-lower-p "gdk_keyval_is_lower") () boolean
   (keyval unsigned-int))
 
+;;; Cairo interaction
+
+#+gtk2.8
+(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))
+
+  (defbinding cairo-set-source-pixbuf () nil
+    (cr cairo:context)
+    (pixbuf pixbuf)
+    (x double-float)
+    (y double-float))
+ 
+  (defbinding cairo-rectangle () nil
+    (cr cairo:context)
+    (rectangle rectangle))
+ 
+;;   (defbinding cairo-region () nil
+;;     (cr cairo:context)
+;;     (region region))
+)