Deprecate the GdkRegion API

[~andy/gtk] / gdk / gdkgc.c

diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index fbdfb6d5ed23f751802aba09318fa872cf2b9bd7..f76ead8002be243e05dd5710f8f52ca780b40b92 100644 (file)
--- a/gdk/gdkgc.c
+++ b/gdk/gdkgc.c
@@ -205,9 +205,9 @@ gdk_gc_finalize (GObject *object)
   GdkGCPrivate *priv = GDK_GC_GET_PRIVATE (gc);
 
   if (priv->clip_region)
-    gdk_region_destroy (priv->clip_region);
+    cairo_region_destroy (priv->clip_region);
   if (priv->old_clip_region)
-    gdk_region_destroy (priv->old_clip_region);
+    cairo_region_destroy (priv->old_clip_region);
   if (priv->clip_mask)
     g_object_unref (priv->clip_mask);
   if (priv->old_clip_mask)
@@ -293,7 +293,7 @@ gdk_gc_set_values (GdkGC           *gc,
       
       if (priv->clip_region)
        {
-         gdk_region_destroy (priv->clip_region);
+         cairo_region_destroy (priv->clip_region);
          priv->clip_region = NULL;
        }
     }
@@ -550,7 +550,7 @@ _gdk_gc_set_clip_region_real (GdkGC     *gc,
     }
   
   if (priv->clip_region)
-    gdk_region_destroy (priv->clip_region);
+    cairo_region_destroy (priv->clip_region);
 
   priv->clip_region = region;
 
@@ -585,9 +585,9 @@ _gdk_gc_add_drawable_clip (GdkGC     *gc,
   if (priv->region_tag_applied)
     _gdk_gc_remove_drawable_clip (gc);
 
-  region = gdk_region_copy (region);
+  region = cairo_region_copy (region);
   if (offset_x != 0 || offset_y != 0)
-    gdk_region_offset (region, offset_x, offset_y);
+    cairo_region_translate (region, offset_x, offset_y);
 
   if (priv->clip_mask)
     {
@@ -596,7 +596,7 @@ _gdk_gc_add_drawable_clip (GdkGC     *gc,
       GdkGC *tmp_gc;
       GdkColor black = {0, 0, 0, 0};
       GdkRectangle r;
-      GdkOverlapType overlap;
+      cairo_region_overlap_t overlap;
 
       gdk_drawable_get_size (priv->clip_mask, &w, &h);
 
@@ -609,8 +609,8 @@ _gdk_gc_add_drawable_clip (GdkGC     *gc,
        * the region, so we try to avoid allocating bitmaps that are just fully
        * set or completely unset.
        */
-      overlap = gdk_region_rect_in (region, &r);
-      if (overlap == GDK_OVERLAP_RECTANGLE_PART)
+      overlap = cairo_region_contains_rectangle (region, &r);
+      if (overlap == CAIRO_REGION_OVERLAP_PART)
        {
           /* The region and the mask intersect, create a new clip mask that
              includes both areas */
@@ -631,12 +631,12 @@ _gdk_gc_add_drawable_clip (GdkGC     *gc,
          gdk_gc_set_clip_mask (gc, new_mask);
          g_object_unref (new_mask);
        }
-      else if (overlap == GDK_OVERLAP_RECTANGLE_OUT)
+      else if (overlap == CAIRO_REGION_OVERLAP_OUT)
        {
          /* No intersection, set empty clip region */
-         GdkRegion *empty = gdk_region_new ();
+         GdkRegion *empty = cairo_region_create ();
 
-         gdk_region_destroy (region);
+         cairo_region_destroy (region);
          priv->old_clip_mask = g_object_ref (priv->clip_mask);
          priv->clip_region = empty;
          _gdk_windowing_gc_set_clip_region (gc, empty, FALSE);
@@ -644,7 +644,7 @@ _gdk_gc_add_drawable_clip (GdkGC     *gc,
       else
        {
          /* Completely inside region, don't set unnecessary clip */
-         gdk_region_destroy (region);
+         cairo_region_destroy (region);
          return;
        }
     }
@@ -653,7 +653,7 @@ _gdk_gc_add_drawable_clip (GdkGC     *gc,
       priv->old_clip_region = priv->clip_region;
       priv->clip_region = region;
       if (priv->old_clip_region)
-       gdk_region_intersect (region, priv->old_clip_region);
+       cairo_region_intersect (region, priv->old_clip_region);
 
       _gdk_windowing_gc_set_clip_region (gc, priv->clip_region, FALSE);
     }
@@ -711,7 +711,7 @@ gdk_gc_set_clip_rectangle (GdkGC              *gc,
   _gdk_gc_remove_drawable_clip (gc);
   
   if (rectangle)
-    region = gdk_region_rectangle (rectangle);
+    region = cairo_region_create_rectangle (rectangle);
   else
     region = NULL;
 
@@ -738,7 +738,7 @@ gdk_gc_set_clip_region (GdkGC           *gc,
   _gdk_gc_remove_drawable_clip (gc);
   
   if (region)
-    copy = gdk_region_copy (region);
+    copy = cairo_region_copy (region);
   else
     copy = NULL;
 
@@ -1063,20 +1063,20 @@ gdk_gc_copy (GdkGC *dst_gc,
   dst_gc->colormap = src_gc->colormap;
 
   if (dst_priv->clip_region)
-    gdk_region_destroy (dst_priv->clip_region);
+    cairo_region_destroy (dst_priv->clip_region);
 
   if (src_priv->clip_region)
-    dst_priv->clip_region = gdk_region_copy (src_priv->clip_region);
+    dst_priv->clip_region = cairo_region_copy (src_priv->clip_region);
   else
     dst_priv->clip_region = NULL;
 
   dst_priv->region_tag_applied = src_priv->region_tag_applied;
   
   if (dst_priv->old_clip_region)
-    gdk_region_destroy (dst_priv->old_clip_region);
+    cairo_region_destroy (dst_priv->old_clip_region);
 
   if (src_priv->old_clip_region)
-    dst_priv->old_clip_region = gdk_region_copy (src_priv->old_clip_region);
+    dst_priv->old_clip_region = cairo_region_copy (src_priv->old_clip_region);
   else
     dst_priv->old_clip_region = NULL;