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()
This commit is contained in:
parent
b09019560b
commit
6a2124d566
@ -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 *
|
cairo_surface_t *
|
||||||
_gdk_drawable_create_cairo_surface (GdkDrawable *drawable,
|
_gdk_drawable_create_cairo_surface (GdkDrawable *drawable,
|
||||||
int width,
|
int width,
|
||||||
|
@ -73,8 +73,6 @@ struct _GdkDrawableClass
|
|||||||
|
|
||||||
cairo_surface_t *(*ref_cairo_surface) (GdkDrawable *drawable);
|
cairo_surface_t *(*ref_cairo_surface) (GdkDrawable *drawable);
|
||||||
|
|
||||||
GdkDrawable *(*get_source_drawable) (GdkDrawable *drawable);
|
|
||||||
|
|
||||||
void (*set_cairo_clip) (GdkDrawable *drawable,
|
void (*set_cairo_clip) (GdkDrawable *drawable,
|
||||||
cairo_t *cr);
|
cairo_t *cr);
|
||||||
|
|
||||||
|
@ -313,7 +313,6 @@ gboolean _gdk_cairo_surface_extents (cairo_surface_t *surface,
|
|||||||
|
|
||||||
cairo_surface_t *_gdk_drawable_ref_cairo_surface (GdkDrawable *drawable);
|
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,
|
cairo_surface_t * _gdk_drawable_create_cairo_surface (GdkDrawable *drawable,
|
||||||
int width,
|
int width,
|
||||||
int height);
|
int height);
|
||||||
|
@ -177,14 +177,6 @@ gdk_offscreen_window_get_depth (GdkDrawable *drawable)
|
|||||||
return gdk_drawable_get_depth (offscreen->wrapper);
|
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*
|
static GdkScreen*
|
||||||
gdk_offscreen_window_get_screen (GdkDrawable *drawable)
|
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_depth = gdk_offscreen_window_get_depth;
|
||||||
drawable_class->get_screen = gdk_offscreen_window_get_screen;
|
drawable_class->get_screen = gdk_offscreen_window_get_screen;
|
||||||
drawable_class->get_visual = gdk_offscreen_window_get_visual;
|
drawable_class->get_visual = gdk_offscreen_window_get_visual;
|
||||||
drawable_class->get_source_drawable = gdk_offscreen_window_get_source_drawable;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -234,8 +234,6 @@ static void gdk_window_real_set_colormap (GdkDrawable *drawable,
|
|||||||
GdkColormap *cmap);
|
GdkColormap *cmap);
|
||||||
static GdkColormap* gdk_window_real_get_colormap (GdkDrawable *drawable);
|
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_clip_region (GdkDrawable *drawable);
|
||||||
static cairo_region_t* gdk_window_get_visible_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->set_cairo_clip = gdk_window_set_cairo_clip;
|
||||||
drawable_class->get_clip_region = gdk_window_get_clip_region;
|
drawable_class->get_clip_region = gdk_window_get_clip_region;
|
||||||
drawable_class->get_visible_region = gdk_window_get_visible_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");
|
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);
|
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*
|
static cairo_region_t*
|
||||||
gdk_window_get_clip_region (GdkDrawable *drawable)
|
gdk_window_get_clip_region (GdkDrawable *drawable)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user