Minor changes for win32

[clg] / gdk / gdk.lisp

diff --git a/gdk/gdk.lisp b/gdk/gdk.lisp
index fce5bd49257967e109654a01fe34b459ad8bf8c1..cf1799b6edd4b92af2e45581b1c9f7f3a34db209 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.
 
 ;; 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")
 
 
 (in-package "GDK")


@@ -236,19 +236,19 @@ (defbinding region-shrink () nil
   (dy int))
 
 (defbinding region-intersect (source1 source2) nil
   (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 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 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 source2) region))
 
 (defbinding region-xor (source1 source2) nil

-  ((ensure-region source1) region :return)
+  ((ensure-region source1) region :in/return)

   ((ensure-region source2) region))
 
 
   ((ensure-region source2) region))
 
 


@@ -1057,9 +1057,8 @@   (defbinding cairo-rectangle () nil
 ;;     (cr cairo:context)
 ;;     (region region))
 
 ;;     (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))

 )
 
 
 )