Improved support for multiple OS platforms

[clg] / gdk / gdk.lisp

diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp
index 63c4e84..48b2237 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.36 2007-05-04 07:28:25 espen Exp $
+;; $Id: gdk.lisp,v 1.38 2007-06-01 09:17:17 espen Exp $
 
 
 (in-package "GDK")
@@ -236,19 +236,19 @@
   (dy int))
 
 (defbinding region-intersect (source1 source2) nil
-  ((ensure-region source1) region :return)
+  ((ensure-region source1) region :in/return)
   ((ensure-region source2) region))
 
 (defbinding region-union (source1 source2) nil
-  ((ensure-region source1) region :return)
+  ((ensure-region source1) region :in/return)
   ((ensure-region source2) region))
 
 (defbinding region-subtract (source1 source2) nil
-  ((ensure-region source1) region :return)
+  ((ensure-region source1) region :in/return)
   ((ensure-region source2) region))
 
 (defbinding region-xor (source1 source2) nil
-  ((ensure-region source1) region :return)
+  ((ensure-region source1) region :in/return)
   ((ensure-region source2) region))
 
 
@@ -1057,9 +1057,8 @@
 ;;     (cr cairo:context)
 ;;     (region region))
 
-  (defbinding (cairo-xlib-surface-get-window 
-              "clg_gdk_cairo_xlib_surface_get_window") () window
-  (surface cairo:xlib-surface))
+  (defbinding (cairo-surface-get-window "clg_gdk_cairo_surface_get_window") () window
+    (surface cairo:surface))
 )