[gtk+/rendering-cleanup: 101/144] gdk: Remove _gdk_drawable_get_source_drawable()
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/rendering-cleanup: 101/144] gdk: Remove _gdk_drawable_get_source_drawable()
- Date: Thu, 23 Sep 2010 21:25:51 +0000 (UTC)
commit 033bc9449c526c5a1240fa8cc4d1dea75498a150
Author: Benjamin Otte <otte redhat com>
Date: Sat Aug 28 11:57:03 2010 +0200
gdk: Remove _gdk_drawable_get_source_drawable()
Now that we don't create pixmaps anymore, this function is not needed
anymore. The indirection it did previously is now basically moved to
gdk_window_create_similar_surface()
gdk/gdkdraw.c | 20 --------------------
gdk/gdkdrawable.h | 2 --
gdk/gdkinternals.h | 1 -
gdk/gdkoffscreenwindow.c | 9 ---------
gdk/gdkwindow.c | 16 ----------------
5 files changed, 0 insertions(+), 48 deletions(-)
---
diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
index 1d88cc2..7ea8e69 100644
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@@ -266,26 +266,6 @@ _gdk_drawable_ref_cairo_surface (GdkDrawable *drawable)
/************************************************************************/
-/*
- * _gdk_drawable_get_source_drawable:
- * @drawable: a #GdkDrawable
- *
- * Returns a drawable for the passed @drawable that is guaranteed to be
- * usable to create a pixmap (e.g.: not an offscreen window).
- *
- * Since: 2.16
- */
-GdkDrawable *
-_gdk_drawable_get_source_drawable (GdkDrawable *drawable)
-{
- g_return_val_if_fail (GDK_IS_DRAWABLE (drawable), NULL);
-
- if (GDK_DRAWABLE_GET_CLASS (drawable)->get_source_drawable)
- return GDK_DRAWABLE_GET_CLASS (drawable)->get_source_drawable (drawable);
-
- return drawable;
-}
-
cairo_surface_t *
_gdk_drawable_create_cairo_surface (GdkDrawable *drawable,
int width,
diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index 1e0c357..7e02b29 100644
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -73,8 +73,6 @@ struct _GdkDrawableClass
cairo_surface_t *(*ref_cairo_surface) (GdkDrawable *drawable);
- GdkDrawable *(*get_source_drawable) (GdkDrawable *drawable);
-
void (*set_cairo_clip) (GdkDrawable *drawable,
cairo_t *cr);
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 2066472..80ea0e1 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -313,7 +313,6 @@ gboolean _gdk_cairo_surface_extents (cairo_surface_t *surface,
cairo_surface_t *_gdk_drawable_ref_cairo_surface (GdkDrawable *drawable);
-GdkDrawable *_gdk_drawable_get_source_drawable (GdkDrawable *drawable);
cairo_surface_t * _gdk_drawable_create_cairo_surface (GdkDrawable *drawable,
int width,
int height);
diff --git a/gdk/gdkoffscreenwindow.c b/gdk/gdkoffscreenwindow.c
index 3e7e9bb..7d25d5b 100644
--- a/gdk/gdkoffscreenwindow.c
+++ b/gdk/gdkoffscreenwindow.c
@@ -177,14 +177,6 @@ gdk_offscreen_window_get_depth (GdkDrawable *drawable)
return gdk_drawable_get_depth (offscreen->wrapper);
}
-static GdkDrawable *
-gdk_offscreen_window_get_source_drawable (GdkDrawable *drawable)
-{
- GdkOffscreenWindow *offscreen = GDK_OFFSCREEN_WINDOW (drawable);
-
- return gdk_screen_get_root_window (offscreen->screen);
-}
-
static GdkScreen*
gdk_offscreen_window_get_screen (GdkDrawable *drawable)
{
@@ -769,7 +761,6 @@ gdk_offscreen_window_class_init (GdkOffscreenWindowClass *klass)
drawable_class->get_depth = gdk_offscreen_window_get_depth;
drawable_class->get_screen = gdk_offscreen_window_get_screen;
drawable_class->get_visual = gdk_offscreen_window_get_visual;
- drawable_class->get_source_drawable = gdk_offscreen_window_get_source_drawable;
}
static void
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index dd07bbc..22f56e6 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -234,8 +234,6 @@ static void gdk_window_real_set_colormap (GdkDrawable *drawable,
GdkColormap *cmap);
static GdkColormap* gdk_window_real_get_colormap (GdkDrawable *drawable);
-static GdkDrawable* gdk_window_get_source_drawable (GdkDrawable *drawable);
-
static cairo_region_t* gdk_window_get_clip_region (GdkDrawable *drawable);
static cairo_region_t* gdk_window_get_visible_region (GdkDrawable *drawable);
@@ -391,7 +389,6 @@ gdk_window_class_init (GdkWindowObjectClass *klass)
drawable_class->set_cairo_clip = gdk_window_set_cairo_clip;
drawable_class->get_clip_region = gdk_window_get_clip_region;
drawable_class->get_visible_region = gdk_window_get_visible_region;
- drawable_class->get_source_drawable = gdk_window_get_source_drawable;
quark_pointer_window = g_quark_from_static_string ("gtk-pointer-window");
@@ -3395,19 +3392,6 @@ gdk_window_flush_recursive (GdkWindowObject *window)
gdk_window_flush_recursive_helper (window, window->impl);
}
-static GdkDrawable *
-gdk_window_get_source_drawable (GdkDrawable *drawable)
-{
- GdkWindow *window = GDK_WINDOW (drawable);
- GdkWindowObject *private;
-
- private = (GdkWindowObject *) window;
- if (GDK_DRAWABLE_GET_CLASS (private->impl)->get_source_drawable)
- return GDK_DRAWABLE_GET_CLASS (private->impl)->get_source_drawable (private->impl);
-
- return drawable;
-}
-
static cairo_region_t*
gdk_window_get_clip_region (GdkDrawable *drawable)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]