[gtk+/rendering-cleanup: 12/31] gdk: Remove _gdk_windowing_get_shape_for_mask()
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/rendering-cleanup: 12/31] gdk: Remove _gdk_windowing_get_shape_for_mask()
- Date: Mon, 16 Aug 2010 12:27:47 +0000 (UTC)
commit bb055ad34253ea0f13ee52ee8255b8b9e23f8ac0
Author: Benjamin Otte <otte redhat com>
Date: Sat Aug 14 06:51:53 2010 +0200
gdk: Remove _gdk_windowing_get_shape_for_mask()
It's unused. And there's a replacement available with
gdk_cairo_region_create_from_surface()
gdk/directfb/gdkwindow-directfb.c | 6 ------
gdk/gdkinternals.h | 1 -
gdk/quartz/gdkwindow-quartz.c | 7 -------
gdk/win32/gdkwindow-win32.c | 12 ------------
gdk/x11/gdkwindow-x11.c | 28 ----------------------------
5 files changed, 0 insertions(+), 54 deletions(-)
---
diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c
index 4a42c95..cc6f0b1 100644
--- a/gdk/directfb/gdkwindow-directfb.c
+++ b/gdk/directfb/gdkwindow-directfb.c
@@ -2750,12 +2750,6 @@ gdk_window_impl_directfb_end_paint (GdkPaintable *paintable)
}
cairo_region_t *
-_gdk_windowing_get_shape_for_mask (GdkBitmap *mask)
-{
- return NULL;
-}
-
-cairo_region_t *
_gdk_windowing_window_get_shape (GdkWindow *window)
{
return NULL;
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 70a8941..12e36c9 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -379,7 +379,6 @@ void _gdk_windowing_window_get_offsets (GdkWindow *window,
gint *y_offset);
cairo_region_t *_gdk_windowing_window_get_shape (GdkWindow *window);
cairo_region_t *_gdk_windowing_window_get_input_shape(GdkWindow *window);
-cairo_region_t *_gdk_windowing_get_shape_for_mask (GdkBitmap *mask);
void _gdk_windowing_window_beep (GdkWindow *window);
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index cf54098..f5d7010 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -3011,13 +3011,6 @@ _gdk_windowing_window_set_composited (GdkWindow *window, gboolean composited)
}
cairo_region_t *
-_gdk_windowing_get_shape_for_mask (GdkBitmap *mask)
-{
- /* FIXME: implement */
- return NULL;
-}
-
-cairo_region_t *
_gdk_windowing_window_get_shape (GdkWindow *window)
{
/* FIXME: implement */
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index f302428..2379e96 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -3213,18 +3213,6 @@ gdk_window_set_opacity (GdkWindow *window,
}
}
-cairo_region_t *
-_gdk_windowing_get_shape_for_mask (GdkBitmap *mask)
-{
- cairo_region_t *region;
- HRGN hrgn = _gdk_win32_bitmap_to_hrgn (mask);
-
- region = _gdk_win32_hrgn_to_region (hrgn);
- DeleteObject (hrgn);
-
- return region;
-}
-
void
_gdk_windowing_window_set_composited (GdkWindow *window, gboolean composited)
{
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index f3188e2..8c64256 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -4612,34 +4612,6 @@ _xwindow_get_shape (Display *xdisplay,
cairo_region_t *
-_gdk_windowing_get_shape_for_mask (GdkBitmap *mask)
-{
- GdkDisplay *display;
- Window window;
- cairo_region_t *region;
-
- display = gdk_drawable_get_display (GDK_DRAWABLE (mask));
-
- window = XCreateSimpleWindow (GDK_DISPLAY_XDISPLAY (display),
- GDK_SCREEN_XROOTWIN (gdk_drawable_get_screen (mask)),
- -1, -1, 1, 1, 0,
- 0, 0);
- XShapeCombineMask (GDK_DISPLAY_XDISPLAY (display),
- window,
- ShapeBounding,
- 0, 0,
- GDK_PIXMAP_XID (mask),
- ShapeSet);
-
- region = _xwindow_get_shape (GDK_DISPLAY_XDISPLAY (display),
- window, ShapeBounding);
-
- XDestroyWindow (GDK_DISPLAY_XDISPLAY (display), window);
-
- return region;
-}
-
-cairo_region_t *
_gdk_windowing_window_get_shape (GdkWindow *window)
{
if (!GDK_WINDOW_DESTROYED (window) &&
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]