cleanup region changes - use macros to redefine gdk_region_XXX in terms of cairo_region_XXX

1 files changed, 0 insertions, 129 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
index 2c0d59c705..896e139138 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/Cairo.java
@@ -93,7 +93,6 @@ public class Cairo extends Platform {
 public static final native int cairo_font_extents_t_sizeof ();
 public static final native int cairo_path_data_t_sizeof ();
 public static final native int cairo_path_t_sizeof ();
-public static final native int cairo_rectangle_int_t_sizeof ();
 public static final native int cairo_text_extents_t_sizeof ();
 	
 /** Natives */
@@ -1699,128 +1698,6 @@ public static final int cairo_xlib_surface_get_width(long /*int*/ surface) {
 	}
 }
 /** @method flags=dynamic */
-public static final native long /*int*/ _cairo_region_create();
-public static final long /*int*/cairo_region_create() {
-	lock.lock();
-	try {
-		return _cairo_region_create();
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _cairo_region_destroy(long /*int*/ region);
-public static final void cairo_region_destroy(long /*int*/ region) {
-	lock.lock();
-	try {
-		_cairo_region_destroy(region);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic  */
-public static final native boolean _cairo_region_is_empty(long /*int*/ region);
-public static final boolean cairo_region_is_empty(long /*int*/ region) {
-	lock.lock();
-	try {
-		return _cairo_region_is_empty (region);
-	} finally {
-		lock.unlock();
-	}
-}
-/**
- * @method flags=dynamic
- */
-public static final native long /*int*/ _cairo_region_subtract(long /*int*/ dst, long /*int*/ other);
-public static final long /*int*/ cairo_region_subtract(long /*int*/ dst, long /*int*/ other) {
-	lock.lock();
-	try {
-		return _cairo_region_subtract(dst, other);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _cairo_region_translate(long /*int*/ region, int dx, int dy);
-public static final void cairo_region_translate(long /*int*/ region, int dx, int dy) {
-	lock.lock();
-	try {
-		_cairo_region_translate(region, dx, dy);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native long /*int*/ _cairo_region_union(long /*int*/ dst, long /*int*/ other);
-public static final long /*int*/ cairo_region_union(long /*int*/ dst, long /*int*/ other) {
-	lock.lock();
-	try {
-		return _cairo_region_union(dst,other);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native long /*int*/ _cairo_region_intersect(long /*int*/ dst, long /*int*/ other);
-public static final long /*int*/ cairo_region_intersect(long /*int*/ dst, long /*int*/ other) {
-	lock.lock();
-	try {
-		return _cairo_region_intersect(dst,other);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native long /*int*/ _cairo_region_create_rectangle(cairo_rectangle_int_t rectangle);
-public static final long /*int*/ cairo_region_create_rectangle(cairo_rectangle_int_t rectangle) {
-	lock.lock();
-	try {
-		return _cairo_region_create_rectangle(rectangle);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native long /*int*/ _cairo_region_contains_rectangle(long /*int*/ region, cairo_rectangle_int_t rectangle);
-public static final long /*int*/ cairo_region_contains_rectangle(long /*int*/ region, cairo_rectangle_int_t rectangle) {
-	lock.lock();
-	try {
-		return _cairo_region_contains_rectangle(region,rectangle);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic  */
-public static final native long /*int*/ _cairo_region_union_rectangle(long /*int*/ dst, cairo_rectangle_int_t rectangle);
-public static final long /*int*/ cairo_region_union_rectangle(long /*int*/ dst, cairo_rectangle_int_t rectangle) {
-	lock.lock();
-	try {
-		return _cairo_region_union_rectangle(dst,rectangle);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native void _cairo_region_get_extents(long /*int*/ region, cairo_rectangle_int_t extents);
-public static final void cairo_region_get_extents(long /*int*/ region, cairo_rectangle_int_t extents) {
-	lock.lock();
-	try {
-		 _cairo_region_contains_rectangle(region,extents);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
-public static final native boolean _cairo_region_contains_point(long /*int*/ region, int x, int y);
-public static final boolean cairo_region_contains_point(long /*int*/ region, int x, int y) {
-	lock.lock();
-	try {
-		return _cairo_region_contains_point(region, x, y);
-	} finally {
-		lock.unlock();
-	}
-}
-/** @method flags=dynamic */
 public static final native int _cairo_region_num_rectangles(long /*int*/ region);
 public static final int cairo_region_num_rectangles(long /*int*/ region) {
 	lock.lock();
@@ -1851,12 +1728,6 @@ public static final native void memmove(cairo_path_t dest, long /*int*/ src, lon
  * @param src cast=(const void *)
  * @param size cast=(size_t)
  */
-public static final native void memmove(cairo_rectangle_int_t dest, long /*int*/ src, long /*int*/ size);
-/**
- * @param dest cast=(void *)
- * @param src cast=(const void *)
- * @param size cast=(size_t)
- */
 public static final native void memmove(cairo_path_data_t dest, long /*int*/ src, long /*int*/ size);
 /**
  * @param dest cast=(void *)