API: gdk_drawable_get_clip_region() => gdk_window_get_clip_region()

Also remove the vfunc from GdkDrawableClass.

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index f277295c35077a28af745d5654c0c94f592e6a87..e884a7722b0dc65007ef4793a6280dc5588649b0 100644 (file)
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -278,7 +278,6 @@ GDK_TYPE_RGBA
 <TITLE>Drawing Primitives</TITLE>
 <FILE>drawing</FILE>
 GdkDrawable
-gdk_drawable_get_clip_region
 gdk_drawable_get_visible_region
 
 <SUBSECTION Standard>
@@ -397,6 +396,7 @@ gdk_window_constrain_size
 gdk_window_beep
 
 <SUBSECTION>
+gdk_window_get_clip_region
 gdk_window_begin_paint_rect
 gdk_window_begin_paint_region
 gdk_window_end_paint

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index abc2f592a2100294cd81916abaa508a30a88a960..d6dacd0384a8f630b7fac1a062b9cba236af1a28 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -154,7 +154,6 @@ gdk_drag_get_selection
 gdk_drag_motion
 gdk_drag_protocol_get_type G_GNUC_CONST
 gdk_drag_status
-gdk_drawable_get_clip_region
 gdk_drawable_get_type G_GNUC_CONST
 gdk_drawable_get_visible_region
 gdk_drop_finish
@@ -414,6 +413,7 @@ gdk_window_geometry_changed
 gdk_window_get_accept_focus
 gdk_window_get_background_pattern
 gdk_window_get_children
+gdk_window_get_clip_region
 gdk_window_get_composited
 gdk_window_get_cursor
 gdk_window_get_decorations

diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
index d31dfd9a66264353895a75df110180e05ac45c17..df9762bf2d34a290158aaf8416ccca9266ff9ebc 100644 (file)
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@@ -50,28 +50,6 @@ gdk_drawable_init (GdkDrawable *drawable)
 {
 }
 
-/**
- * gdk_drawable_get_clip_region:
- * @drawable: a #GdkDrawable
- * 
- * Computes the region of a drawable that potentially can be written
- * to by drawing primitives. This region will not take into account
- * the clip region for the GC, and may also not take into account
- * other factors such as if the window is obscured by other windows,
- * but no area outside of this region will be affected by drawing
- * primitives.
- * 
- * Returns: a #cairo_region_t. This must be freed with cairo_region_destroy()
- *          when you are done.
- **/
-cairo_region_t *
-gdk_drawable_get_clip_region (GdkDrawable *drawable)
-{
-  g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
-
-  return GDK_DRAWABLE_GET_CLASS (drawable)->get_clip_region (drawable);
-}
-
 /**
  * gdk_drawable_get_visible_region:
  * @drawable: a #GdkDrawable

diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index 24fa1228510467d0ff658beccced76adc79ee8c3..1c619a89088a4464f7aba192a28011118d2a015e 100644 (file)
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -62,7 +62,6 @@ struct _GdkDrawableClass
 {
   GObjectClass parent_class;
   
-  cairo_region_t*   (*get_clip_region)    (GdkDrawable  *drawable);
   cairo_region_t*   (*get_visible_region) (GdkDrawable  *drawable);
 
   cairo_surface_t *(*ref_cairo_surface) (GdkDrawable *drawable);
@@ -84,7 +83,6 @@ struct _GdkDrawableClass
 
 GType           gdk_drawable_get_type     (void) G_GNUC_CONST;
 
-cairo_region_t *gdk_drawable_get_clip_region    (GdkDrawable *drawable);
 cairo_region_t *gdk_drawable_get_visible_region (GdkDrawable *drawable);
 
 G_END_DECLS

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index bb466439cdfcece843f9e6abed4f0b9a09f177af..5523d07a6261b1803d71f6c0e64bbe7fd0e9acb8 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -225,7 +225,6 @@ static cairo_surface_t *gdk_window_create_cairo_surface (GdkDrawable *drawable,
                                                         int height);
 static void             gdk_window_drop_cairo_surface (GdkWindowObject *private);
 
-static cairo_region_t*   gdk_window_get_clip_region        (GdkDrawable *drawable);
 static cairo_region_t*   gdk_window_get_visible_region     (GdkDrawable *drawable);
 
 static void gdk_window_free_paint_stack (GdkWindow *window);
@@ -383,7 +382,6 @@ gdk_window_class_init (GdkWindowObjectClass *klass)
 
   drawable_class->ref_cairo_surface = gdk_window_ref_cairo_surface;
   drawable_class->create_cairo_surface = gdk_window_create_cairo_surface;
-  drawable_class->get_clip_region = gdk_window_get_clip_region;
   drawable_class->get_visible_region = gdk_window_get_visible_region;
 
   klass->create_surface = _gdk_offscreen_window_create_surface;
@@ -3516,12 +3514,29 @@ gdk_window_flush_recursive (GdkWindowObject *window)
   gdk_window_flush_recursive_helper (window, window->impl);
 }
 
-static cairo_region_t*
-gdk_window_get_clip_region (GdkDrawable *drawable)
+/**
+ * gdk_window_get_clip_region:
+ * @window: a #GdkWindow
+ * 
+ * Computes the region of a window that potentially can be written
+ * to by drawing primitives. This region may not take into account
+ * other factors such as if the window is obscured by other windows,
+ * but no area outside of this region will be affected by drawing
+ * primitives.
+ * 
+ * Returns: a #cairo_region_t. This must be freed with cairo_region_destroy()
+ *          when you are done.
+ **/
+cairo_region_t*
+gdk_window_get_clip_region (GdkWindow *window)
 {
-  GdkWindowObject *private = (GdkWindowObject *)drawable;
+  GdkWindowObject *private;
   cairo_region_t *result;
 
+  g_return_val_if_fail (GDK_WINDOW (window), NULL);
+
+  private = (GdkWindowObject *) window;
+
   result = cairo_region_copy (private->clip_region);
 
   if (private->paint_stack)

diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 8a2fd4ba0e1da2c546d3860a3bad357121b2a31f..f600c76ae0eaeea3aadaac81485b747293bc2b1b 100644 (file)
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -680,6 +680,8 @@ void          gdk_window_set_geometry_hints (GdkWindow          *window,
                                             GdkWindowHints      geom_mask);
 void          gdk_set_sm_client_id          (const gchar        *sm_client_id);
 
+cairo_region_t *gdk_window_get_clip_region  (GdkWindow          *window);
+
 void         gdk_window_begin_paint_rect   (GdkWindow          *window,
                                             const GdkRectangle *rectangle);
 void         gdk_window_begin_paint_region (GdkWindow          *window,