[gtk+/rendering-cleanup: 78/95] gdk: Remove picture pointer from X11 drawable
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/rendering-cleanup: 78/95] gdk: Remove picture pointer from X11 drawable
- Date: Sun, 8 Aug 2010 02:20:59 +0000 (UTC)
commit a30c4a10576b3a22674629ee4ca6c1ef36e58052
Author: Kristian Høgsberg <krh bitplanet net>
Date: Thu Aug 5 10:10:45 2010 -0400
gdk: Remove picture pointer from X11 drawable
It's not used anymore
gdk/x11/gdkdisplay-x11.h | 3 ---
gdk/x11/gdkdrawable-x11.c | 7 -------
gdk/x11/gdkdrawable-x11.h | 2 --
3 files changed, 0 insertions(+), 12 deletions(-)
---
diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index 697632b..86beda5 100644
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -147,9 +147,6 @@ struct _GdkDisplayX11
guint have_input_shapes : 1;
gint shape_event_base;
- /* Alpha mask picture format */
- XRenderPictFormat *mask_format;
-
/* The offscreen window that has the pointer in it (if any) */
GdkWindow *active_offscreen_window;
};
diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index 8fba6eb..9204745 100644
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -107,13 +107,6 @@ _gdk_x11_drawable_finish (GdkDrawable *drawable)
{
GdkDrawableImplX11 *impl = GDK_DRAWABLE_IMPL_X11 (drawable);
- if (impl->picture)
- {
- XRenderFreePicture (GDK_SCREEN_XDISPLAY (impl->screen),
- impl->picture);
- impl->picture = None;
- }
-
if (impl->cairo_surface)
{
cairo_surface_finish (impl->cairo_surface);
diff --git a/gdk/x11/gdkdrawable-x11.h b/gdk/x11/gdkdrawable-x11.h
index 2b88536..4d387c1 100644
--- a/gdk/x11/gdkdrawable-x11.h
+++ b/gdk/x11/gdkdrawable-x11.h
@@ -32,7 +32,6 @@
#include <gdk/gdkdrawable.h>
#include <X11/Xlib.h>
-#include <X11/extensions/Xrender.h>
G_BEGIN_DECLS
@@ -68,7 +67,6 @@ struct _GdkDrawableImplX11
Window xid;
GdkScreen *screen;
- Picture picture;
cairo_surface_t *cairo_surface;
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]