[gtk+/rendering-cleanup: 94/142] gdk: Remove GdkPixmap
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/rendering-cleanup: 94/142] gdk: Remove GdkPixmap
- Date: Tue, 14 Sep 2010 15:42:50 +0000 (UTC)
commit a985c18cb04855a5b3121c2b65a3df4e58291ba3
Author: Benjamin Otte <otte redhat com>
Date: Fri Aug 27 17:05:48 2010 +0200
gdk: Remove GdkPixmap
All iusers of it are gone, so it's now time to let go.
cairo_surface_t is a full replacement, combined with
gdk_window_create_similar_surface().
docs/reference/gdk/gdk3-sections.txt | 28 ---
examples/pixmap/pixmap.c | 89 -------
gdk/Makefile.am | 3 -
gdk/gdk.h | 1 -
gdk/gdk.symbols | 26 --
gdk/gdkinternals.h | 6 -
gdk/gdkpixbuf-drawable.c | 30 +---
gdk/gdkpixmap.c | 196 ----------------
gdk/gdkpixmap.h | 94 --------
gdk/gdktypes.h | 11 +-
gdk/makefile.msc | 2 -
gdk/quartz/Makefile.am | 2 -
gdk/quartz/gdkpixmap-quartz.c | 260 ---------------------
gdk/quartz/gdkpixmap-quartz.h | 64 -----
gdk/quartz/gdkprivate-quartz.h | 1 -
gdk/win32/Makefile.am | 2 -
gdk/win32/gdkdrawable-win32.c | 5 +-
gdk/win32/gdkim-win32.c | 1 -
gdk/win32/gdkpixmap-win32.c | 417 ----------------------------------
gdk/win32/gdkpixmap-win32.h | 67 ------
gdk/win32/gdkprivate-win32.h | 3 -
gdk/win32/gdkwin32.h | 3 +-
gdk/win32/makefile.msc | 1 -
gdk/x11/Makefile.am | 2 -
gdk/x11/gdkcursor-x11.c | 2 -
gdk/x11/gdkdrawable-x11.c | 23 +--
gdk/x11/gdkdrawable-x11.h | 1 -
gdk/x11/gdkim-x11.c | 1 -
gdk/x11/gdkpixmap-x11.c | 361 -----------------------------
gdk/x11/gdkpixmap-x11.h | 68 ------
gdk/x11/gdkprivate-x11.h | 10 +-
gdk/x11/gdkscreen-x11.c | 9 +-
gdk/x11/gdkx.h | 9 +-
gdk/x11/gdkxid.c | 10 +-
34 files changed, 26 insertions(+), 1782 deletions(-)
---
diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index 2476942..dfbdb03 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -240,28 +240,6 @@ gdk_screen_get_type
</SECTION>
<SECTION>
-<TITLE>Bitmaps and Pixmaps</TITLE>
-<FILE>pixmaps</FILE>
-GdkPixmap
-gdk_pixmap_new
-GdkBitmap
-
-<SUBSECTION Standard>
-GDK_PIXMAP
-GDK_PIXMAP_GET_CLASS
-GDK_PIXMAP_OBJECT
-GDK_TYPE_PIXMAP
-GDK_IS_PIXMAP
-GDK_PIXMAP_CLASS
-GDK_IS_PIXMAP_CLASS
-
-<SUBSECTION Private>
-gdk_pixmap_get_type
-GdkPixmapObject
-GdkPixmapObjectClass
-</SECTION>
-
-<SECTION>
<TITLE>Pixbufs</TITLE>
<FILE>pixbufs</FILE>
gdk_pixbuf_get_from_drawable
@@ -1013,17 +991,12 @@ GDK_CURSOR_XCURSOR
GDK_CURSOR_XDISPLAY
GDK_WINDOW_XWINDOW
gdkx_visual_get
-gdk_pixmap_foreign_new
-gdk_pixmap_foreign_new_for_display
-gdk_pixmap_foreign_new_for_screen
gdk_window_foreign_new
gdk_window_foreign_new_for_display
gdk_xid_table_lookup
gdk_xid_table_lookup_for_display
gdk_window_lookup
gdk_window_lookup_for_display
-gdk_pixmap_lookup
-gdk_pixmap_lookup_for_display
gdk_x11_lookup_xdisplay
gdk_x11_get_server_time
gdk_net_wm_supports
@@ -1068,7 +1041,6 @@ gdk_x11_get_xatom_name_for_display
<SUBSECTION Private>
GDK_HAVE_WCHAR_H
GDK_HAVE_WCTYPE_H
-gdk_x11_pixmap_get_drawable_impl
gdk_x11_window_get_drawable_impl
</SECTION>
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 1c3fa32..3f8b9a8 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -87,7 +87,6 @@ gdk_public_h_sources = \
gdkkeysyms-compat.h \
gdkpango.h \
gdkpixbuf.h \
- gdkpixmap.h \
gdkprivate.h \
gdkproperty.h \
gdkscreen.h \
@@ -127,7 +126,6 @@ gdk_c_sources = \
gdkoffscreenwindow.c \
gdkpango.c \
gdkpixbuf-drawable.c \
- gdkpixmap.c \
gdkrectangle.c \
gdkscreen.c \
gdkselection.c \
@@ -209,7 +207,6 @@ x11_introspection_files = \
x11/gdkinput.c \
x11/gdkkeys-x11.c \
x11/gdkmain-x11.c \
- x11/gdkpixmap-x11.c \
x11/gdkproperty-x11.c \
x11/gdkscreen-x11.c \
x11/gdkselection-x11.c \
diff --git a/gdk/gdk.h b/gdk/gdk.h
index a6c7578..d6c12a2 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -46,7 +46,6 @@
#include <gdk/gdkkeysyms.h>
#include <gdk/gdkpango.h>
#include <gdk/gdkpixbuf.h>
-#include <gdk/gdkpixmap.h>
#include <gdk/gdkproperty.h>
#include <gdk/gdkscreen.h>
#include <gdk/gdkselection.h>
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index dc466a5..c1ea644 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -544,14 +544,6 @@ gdk_drawable_set_colormap
#endif
#endif
-#if IN_HEADER(__GDK_PIXMAP_X11_H__)
-#if IN_FILE(__GDK_PIXMAP_X11_C__)
-#ifdef GDK_WINDOWING_X11
-gdk_pixmap_impl_x11_get_type G_GNUC_CONST
-#endif
-#endif
-#endif
-
#if IN_HEADER(__GDK_WINDOW_X11_H__)
#if IN_FILE(__GDK_WINDOW_X11_C__)
#ifdef GDK_WINDOWING_X11
@@ -814,23 +806,6 @@ gdk_pixbuf_get_from_surface
#endif
#endif
-#if IN_HEADER(__GDK_PIXMAP_H__)
-#if IN_FILE(__GDK_PIXMAP_C__)
-gdk_pixmap_get_type G_GNUC_CONST
-gdk_pixmap_new
-#endif
-#endif
-
-#if IN_HEADER(__GDK_PIXMAP_H__)
-#if IN_FILE(__GDK_PIXMAP_X11_C__)
-gdk_pixmap_foreign_new
-gdk_pixmap_foreign_new_for_display
-gdk_pixmap_foreign_new_for_screen
-gdk_pixmap_lookup
-gdk_pixmap_lookup_for_display
-#endif
-#endif
-
#if IN_HEADER(__GDK_SCREEN_H__)
#if IN_FILE(__GDK_SCREEN_C__)
gdk_screen_get_type G_GNUC_CONST
@@ -1019,7 +994,6 @@ gdk_x11_register_standard_event_type
gdk_x11_drawable_get_xdisplay
gdk_x11_drawable_get_xid
gdk_x11_window_get_drawable_impl
-gdk_x11_pixmap_get_drawable_impl
#endif
#if IN_FILE(__GDK_MAIN_X11_C__)
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 91aca88..d3ad7a2 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -325,11 +325,6 @@ cairo_surface_t * _gdk_drawable_create_cairo_surface (GdkDrawable *drawable,
* Interfaces used by windowing code *
*************************************/
-GdkPixmap *_gdk_pixmap_new (GdkDrawable *drawable,
- gint width,
- gint height,
- gint depth);
-
void _gdk_window_impl_new (GdkWindow *window,
GdkWindow *real_parent,
GdkScreen *screen,
@@ -450,7 +445,6 @@ GType _gdk_paintable_get_type (void) G_GNUC_CONST;
/* Implementation types */
GType _gdk_window_impl_get_type (void) G_GNUC_CONST;
-GType _gdk_pixmap_impl_get_type (void) G_GNUC_CONST;
struct GdkAppLaunchContextPrivate
{
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index be99f42..6cc35fc 100644
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -28,7 +28,6 @@
#include "gdkcolor.h"
#include "gdkwindow.h"
#include "gdkpixbuf.h"
-#include "gdkpixmap.h"
#include "gdkinternals.h"
@@ -53,14 +52,8 @@
*
* If the drawable @src has no colormap (gdk_drawable_get_colormap()
* returns %NULL), then a suitable colormap must be specified.
- * Typically a #GdkWindow or a pixmap created by passing a #GdkWindow
- * to gdk_pixmap_new() will already have a colormap associated with
- * it. If the drawable has a colormap, the @cmap argument will be
- * ignored. If the drawable is a bitmap (1 bit per pixel pixmap),
- * then a colormap is not required; pixels with a value of 1 are
- * assumed to be white, and pixels with a value of 0 are assumed to be
- * black. For taking screenshots, gdk_colormap_get_system() returns
- * the correct colormap to use.
+ * If the drawable has a colormap, the @cmap argument will be
+ * ignored.
*
* If the specified destination pixbuf @dest is %NULL, then this
* function will create an RGB pixbuf with 8 bits per channel and no
@@ -70,12 +63,6 @@
* and it contains alpha information, then the filled pixels will be
* set to full opacity (alpha = 255).
*
- * If the specified drawable is a pixmap, then the requested source
- * rectangle must be completely contained within the pixmap, otherwise
- * the function will return %NULL. For pixmaps only (not for windows)
- * passing -1 for width or height is allowed to mean the full width
- * or height of the pixmap.
- *
* If the specified drawable is a window, and the window is off the
* screen, then there is no image data in the obscured/offscreen
* regions to be placed in the pixbuf. The contents of portions of the
@@ -106,7 +93,6 @@ gdk_pixbuf_get_from_drawable (GdkPixbuf *dest,
int dest_x, int dest_y,
int width, int height)
{
- int src_width, src_height;
cairo_surface_t *surface;
int depth;
@@ -155,18 +141,6 @@ gdk_pixbuf_get_from_drawable (GdkPixbuf *dest,
/* Coordinate sanity checks */
- if (GDK_IS_PIXMAP (src))
- {
- gdk_drawable_get_size (src, &src_width, &src_height);
- if (width < 0)
- width = src_width;
- if (height < 0)
- height = src_height;
-
- g_return_val_if_fail (src_x >= 0 && src_y >= 0, NULL);
- g_return_val_if_fail (src_x + width <= src_width && src_y + height <= src_height, NULL);
- }
-
surface = _gdk_drawable_ref_cairo_surface (src);
dest = gdk_pixbuf_get_from_surface (dest,
surface,
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index ab52197..e36d01c 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -51,8 +51,8 @@
/**
* GDK_PARENT_RELATIVE:
*
- * A special value for #GdkPixmap variables, indicating that the background
- * pixmap for a window should be inherited from the parent window.
+ * A special value, indicating that the background
+ * for a window should be inherited from the parent window.
*/
#define GDK_PARENT_RELATIVE 1L
@@ -95,16 +95,11 @@ typedef struct _GdkCursor GdkCursor;
typedef struct _GdkVisual GdkVisual;
typedef struct _GdkDrawable GdkDrawable;
-typedef struct _GdkDrawable GdkBitmap;
-typedef struct _GdkDrawable GdkPixmap;
/**
* GdkWindow:
*
- * An opaque structure representing an onscreen drawable. Pointers to structures
- * of type #GdkPixmap, #GdkBitmap, and #GdkWindow can often be used
- * interchangeably. The type #GdkDrawable refers generically to any of these
- * types.
+ * An opaque structure representing an onscreen drawable.
*/
typedef struct _GdkDrawable GdkWindow;
typedef struct _GdkDisplay GdkDisplay;
diff --git a/gdk/makefile.msc b/gdk/makefile.msc
index 717e2b9..648427c 100644
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -84,7 +84,6 @@ gdk_OBJECTS = \
gdkpango.obj \
gdkpixbuf-drawable.obj \
gdkpixbuf-render.obj \
- gdkpixmap.obj \
gdkrectangle.obj \
gdkscreen.obj \
gdkselection.obj \
@@ -104,7 +103,6 @@ gdk_public_h_sources = \
gdkkeys.h \
gdkpango.h \
gdkpixbuf.h \
- gdkpixmap.h \
gdkproperty.h \
gdkselection.h \
gdktypes.h \
diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index 683ea3e..2bb63b9 100644
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -39,8 +39,6 @@ libgdk_quartz_la_SOURCES = \
gdkinputprivate.h \
gdkkeys-quartz.c \
gdkmain-quartz.c \
- gdkpixmap-quartz.c \
- gdkpixmap-quartz.h \
gdkprivate-quartz.h \
gdkproperty-quartz.c \
gdkquartz.h \
diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h
index 6c4d793..9dc090e 100644
--- a/gdk/quartz/gdkprivate-quartz.h
+++ b/gdk/quartz/gdkprivate-quartz.h
@@ -25,7 +25,6 @@
#define GDK_QUARTZ_RELEASE_POOL [pool release]
#include <gdk/gdkprivate.h>
-#include <gdk/quartz/gdkpixmap-quartz.h>
#include <gdk/quartz/gdkwindow-quartz.h>
#include <gdk/quartz/gdkquartz.h>
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 889791a..a1cf0fd 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -46,8 +46,6 @@ libgdk_win32_la_SOURCES = \
gdkinput.c \
gdkkeys-win32.c \
gdkmain-win32.c \
- gdkpixmap-win32.c \
- gdkpixmap-win32.h \
gdkprivate-win32.h \
gdkproperty-win32.c \
gdkscreen-win32.c \
diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index 13fca73..e594b88 100644
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -310,9 +310,8 @@ gdk_win32_drawable_get_handle (GdkDrawable *drawable)
* @drawable: a Win32 #GdkDrawable implementation
*
* Releases any resources allocated internally for the drawable.
- * This is called when the drawable becomes unusable
- * (gdk_window_destroy() for a window, or the refcount going to
- * zero for a pixmap.)
+ * This is called when the drawable becomes unusable, i.e.
+ * gdk_window_destroy() is called.
**/
void
_gdk_win32_drawable_finish (GdkDrawable *drawable)
diff --git a/gdk/win32/gdkim-win32.c b/gdk/win32/gdkim-win32.c
index 128d7b8..dd7cf87 100644
--- a/gdk/win32/gdkim-win32.c
+++ b/gdk/win32/gdkim-win32.c
@@ -31,7 +31,6 @@
#include <string.h>
#include <locale.h>
-#include "gdkpixmap.h"
#include "gdkinternals.h"
#include "gdkwin32.h"
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index b7b279e..3b159c3 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -37,7 +37,6 @@
#include <gdk/gdkprivate.h>
#include <gdk/win32/gdkwindow-win32.h>
-#include <gdk/win32/gdkpixmap-win32.h>
#include "gdkinternals.h"
@@ -184,8 +183,6 @@ void gdk_win32_handle_table_remove (HANDLE handle);
COLORREF _gdk_win32_colormap_color (GdkColormap *colormap,
gulong pixel);
-HRGN _gdk_win32_bitmap_to_hrgn (GdkPixmap *bitmap);
-
HRGN _gdk_win32_cairo_region_to_hrgn (const cairo_region_t *region,
gint x_origin,
gint y_origin);
diff --git a/gdk/win32/gdkwin32.h b/gdk/win32/gdkwin32.h
index df76eff..5a49475 100644
--- a/gdk/win32/gdkwin32.h
+++ b/gdk/win32/gdkwin32.h
@@ -42,9 +42,8 @@ G_BEGIN_DECLS
#include "gdkprivate-win32.h"
#define GDK_WINDOW_HWND(win) (GDK_DRAWABLE_IMPL_WIN32(((GdkWindowObject *)win)->impl)->handle)
-#define GDK_PIXMAP_HBITMAP(pixmap) (GDK_DRAWABLE_IMPL_WIN32(((GdkPixmapObject *)pixmap)->impl)->handle)
#define GDK_DRAWABLE_IMPL_WIN32_HANDLE(d) (((GdkDrawableImplWin32 *) d)->handle)
-#define GDK_DRAWABLE_HANDLE(win) (GDK_IS_WINDOW (win) ? GDK_WINDOW_HWND (win) : (GDK_IS_PIXMAP (win) ? GDK_PIXMAP_HBITMAP (win) : (GDK_IS_DRAWABLE_IMPL_WIN32 (win) ? GDK_DRAWABLE_IMPL_WIN32_HANDLE (win) : 0)))
+#define GDK_DRAWABLE_HANDLE(win) (GDK_IS_WINDOW (win) ? GDK_WINDOW_HWND (win) : (GDK_IS_DRAWABLE_IMPL_WIN32 (win) ? GDK_DRAWABLE_IMPL_WIN32_HANDLE (win) : 0))
#else
/* definition for exported 'internals' go here */
#define GDK_WINDOW_HWND(d) (gdk_win32_drawable_get_handle (d))
diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc
index 45a3350..c87eeed 100644
--- a/gdk/win32/makefile.msc
+++ b/gdk/win32/makefile.msc
@@ -46,7 +46,6 @@ gdk_win32_OBJECTS = \
gdkinput-win32.obj \
gdkkeys-win32.obj \
gdkmain-win32.obj \
- gdkpixmap-win32.obj \
gdkproperty-win32.obj \
# gdkregion-win32.obj \
gdkscreen-win32.obj \
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index c83b7cd..f0d45c2 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -43,8 +43,6 @@ libgdk_x11_la_SOURCES = \
gdkinput.c \
gdkkeys-x11.c \
gdkmain-x11.c \
- gdkpixmap-x11.c \
- gdkpixmap-x11.h \
gdkproperty-x11.c \
gdkscreen-x11.c \
gdkscreen-x11.h \
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 1ef1a50..67ce6d4 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -41,9 +41,7 @@
#include "gdkprivate-x11.h"
#include "gdkcursor.h"
#include "gdkdisplay-x11.h"
-#include "gdkpixmap-x11.h"
#include "gdkx.h"
-#include <gdk/gdkpixmap.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
static guint theme_serial = 0;
diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index 2fff65e..a715bd1 100644
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -35,7 +35,6 @@
#include "gdkprivate-x11.h"
#include "gdkdrawable-x11.h"
-#include "gdkpixmap-x11.h"
#include "gdkscreen-x11.h"
#include "gdkdisplay-x11.h"
@@ -95,8 +94,7 @@ gdk_drawable_impl_x11_finalize (GObject *object)
* _gdk_x11_drawable_finish:
* @drawable: a #GdkDrawableImplX11.
*
- * Performs necessary cleanup prior to freeing a pixmap or
- * destroying a window.
+ * Performs necessary cleanup prior to destroying a window.
**/
void
_gdk_x11_drawable_finish (GdkDrawable *drawable)
@@ -177,11 +175,9 @@ get_impl_drawable (GdkDrawable *drawable)
{
if (GDK_IS_WINDOW (drawable))
return ((GdkWindowObject *)drawable)->impl;
- else if (GDK_IS_PIXMAP (drawable))
- return ((GdkPixmapObject *)drawable)->impl;
else
{
- g_warning (G_STRLOC " drawable is not a pixmap or window");
+ g_warning (G_STRLOC " drawable is not a window");
return NULL;
}
}
@@ -222,7 +218,7 @@ gdk_x11_drawable_get_xdisplay (GdkDrawable *drawable)
* gdk_x11_drawable_get_xid:
* @drawable: a #GdkDrawable.
*
- * Returns the X resource (window or pixmap) belonging to a #GdkDrawable.
+ * Returns the X resource (window) belonging to a #GdkDrawable.
*
* Return value: the ID of @drawable's X resource.
**/
@@ -255,11 +251,9 @@ gdk_x11_drawable_get_xid (GdkDrawable *drawable)
impl = ((GdkWindowObject *)drawable)->impl;
}
- else if (GDK_IS_PIXMAP (drawable))
- impl = ((GdkPixmapObject *)drawable)->impl;
else
{
- g_warning (G_STRLOC " drawable is not a pixmap or window");
+ g_warning (G_STRLOC " drawable is not a window");
return None;
}
@@ -271,11 +265,6 @@ gdk_x11_window_get_drawable_impl (GdkWindow *window)
{
return ((GdkWindowObject *)window)->impl;
}
-GdkDrawable *
-gdk_x11_pixmap_get_drawable_impl (GdkPixmap *pixmap)
-{
- return ((GdkPixmapObject *)pixmap)->impl;
-}
static void
gdk_x11_cairo_surface_destroy (void *data)
@@ -317,9 +306,7 @@ gdk_x11_create_cairo_surface (GdkDrawable *drawable,
{
g_warning ("Using Cairo rendering requires the drawable argument to\n"
"have a specified colormap. All windows have a colormap,\n"
- "however, pixmaps only have colormap by default if they\n"
- "were created with a non-NULL window argument. Otherwise\n"
- "a colormap must be set on them with gdk_drawable_set_colormap");
+ "so why is this code even reached?");
return NULL;
}
diff --git a/gdk/x11/gdkdrawable-x11.h b/gdk/x11/gdkdrawable-x11.h
index 7d243db..f499455 100644
--- a/gdk/x11/gdkdrawable-x11.h
+++ b/gdk/x11/gdkdrawable-x11.h
@@ -74,7 +74,6 @@ GType _gdk_drawable_impl_x11_get_type (void);
void _gdk_x11_drawable_finish (GdkDrawable *drawable);
void _gdk_x11_drawable_update_size (GdkDrawable *drawable);
GdkDrawable *gdk_x11_window_get_drawable_impl (GdkWindow *window);
-GdkDrawable *gdk_x11_pixmap_get_drawable_impl (GdkPixmap *pixmap);
G_END_DECLS
diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index 9fabd77..53c7aa6 100644
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -32,7 +32,6 @@
#include "gdkx.h"
#include "gdk.h" /* For gdk_flush() */
-#include "gdkpixmap.h"
#include "gdkinternals.h"
#include "gdkdisplay-x11.h"
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 95c55ee..547cb6a 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -36,7 +36,6 @@
#include <gdk/gdkcursor.h>
#include <gdk/gdkprivate.h>
#include <gdk/x11/gdkwindow-x11.h>
-#include <gdk/x11/gdkpixmap-x11.h>
#include <gdk/x11/gdkdisplay-x11.h>
#include "gdkinternals.h"
@@ -159,12 +158,9 @@ extern const int _gdk_event_mask_table[];
extern GdkAtom _gdk_selection_property;
extern gboolean _gdk_synchronize;
-#define GDK_PIXMAP_SCREEN(pix) (GDK_DRAWABLE_IMPL_X11 (((GdkPixmapObject *)pix)->impl)->screen)
-#define GDK_PIXMAP_DISPLAY(pix) (GDK_SCREEN_X11 (GDK_PIXMAP_SCREEN (pix))->display)
-#define GDK_PIXMAP_XROOTWIN(pix) (GDK_SCREEN_X11 (GDK_PIXMAP_SCREEN (pix))->xroot_window)
-#define GDK_DRAWABLE_DISPLAY(win) (GDK_IS_WINDOW (win) ? GDK_WINDOW_DISPLAY (win) : GDK_PIXMAP_DISPLAY (win))
-#define GDK_DRAWABLE_SCREEN(win) (GDK_IS_WINDOW (win) ? GDK_WINDOW_SCREEN (win) : GDK_PIXMAP_SCREEN (win))
-#define GDK_DRAWABLE_XROOTWIN(win) (GDK_IS_WINDOW (win) ? GDK_WINDOW_XROOTWIN (win) : GDK_PIXMAP_XROOTWIN (win))
+#define GDK_DRAWABLE_DISPLAY(win) (GDK_WINDOW_DISPLAY (win))
+#define GDK_DRAWABLE_SCREEN(win) (GDK_WINDOW_SCREEN (win))
+#define GDK_DRAWABLE_XROOTWIN(win) (GDK_WINDOW_XROOTWIN (win))
#define GDK_SCREEN_DISPLAY(screen) (GDK_SCREEN_X11 (screen)->display)
#define GDK_SCREEN_XROOTWIN(screen) (GDK_SCREEN_X11 (screen)->xroot_window)
#define GDK_WINDOW_SCREEN(win) (GDK_DRAWABLE_IMPL_X11 (((GdkWindowObject *)win)->impl)->screen)
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 44abed2..84a0dd3 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -541,8 +541,8 @@ gdk_screen_get_monitor_geometry (GdkScreen *screen,
* gdk_screen_get_rgba_colormap:
* @screen: a #GdkScreen.
*
- * Gets a colormap to use for creating windows or pixmaps with an
- * alpha channel. The windowing system on which GTK+ is running
+ * Gets a colormap to use for creating windows with an alpha
+ * channel. The windowing system on which GTK+ is running
* may not support this capability, in which case %NULL will
* be returned. Even if a non-%NULL value is returned, its
* possible that the window's alpha channel won't be honored
@@ -583,9 +583,8 @@ gdk_screen_get_rgba_colormap (GdkScreen *screen)
* gdk_screen_get_rgba_visual:
* @screen: a #GdkScreen
*
- * Gets a visual to use for creating windows or pixmaps with an
- * alpha channel. See the docs for gdk_screen_get_rgba_colormap()
- * for caveats.
+ * Gets a visual to use for creating windows with an alpha channel.
+ * See the docs for gdk_screen_get_rgba_colormap() for caveats.
*
* Return value: (transfer none): a visual to use for windows with an
* alpha channel or %NULL if the capability is not available.
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index ec6ddd5..f82f7c0 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -37,7 +37,6 @@ G_BEGIN_DECLS
Display *gdk_x11_drawable_get_xdisplay (GdkDrawable *drawable);
XID gdk_x11_drawable_get_xid (GdkDrawable *drawable);
GdkDrawable *gdk_x11_window_get_drawable_impl (GdkWindow *window);
-GdkDrawable *gdk_x11_pixmap_get_drawable_impl (GdkPixmap *pixmap);
Display *gdk_x11_colormap_get_xdisplay (GdkColormap *colormap);
Colormap gdk_x11_colormap_get_xcolormap (GdkColormap *colormap);
Display *gdk_x11_cursor_get_xdisplay (GdkCursor *cursor);
@@ -72,10 +71,8 @@ gint gdk_x11_get_default_screen (void);
#define GDK_WINDOW_XDISPLAY(win) (GDK_SCREEN_X11 (GDK_WINDOW_SCREEN (win))->xdisplay)
#define GDK_WINDOW_XID(win) (GDK_DRAWABLE_IMPL_X11(((GdkWindowObject *)win)->impl)->xid)
-#define GDK_PIXMAP_XDISPLAY(pix) (GDK_SCREEN_X11 (GDK_PIXMAP_SCREEN (pix))->xdisplay)
-#define GDK_PIXMAP_XID(pix) (GDK_DRAWABLE_IMPL_X11(((GdkPixmapObject *)pix)->impl)->xid)
-#define GDK_DRAWABLE_XDISPLAY(win) (GDK_IS_WINDOW (win) ? GDK_WINDOW_XDISPLAY (win) : GDK_PIXMAP_XDISPLAY (win))
-#define GDK_DRAWABLE_XID(win) (GDK_IS_WINDOW (win) ? GDK_WINDOW_XID (win) : GDK_PIXMAP_XID (win))
+#define GDK_DRAWABLE_XDISPLAY(win) (GDK_WINDOW_XDISPLAY (win))
+#define GDK_DRAWABLE_XID(win) (GDK_WINDOW_XID (win))
#define GDK_SCREEN_XDISPLAY(screen) (GDK_SCREEN_X11 (screen)->xdisplay)
#define GDK_SCREEN_XSCREEN(screen) (GDK_SCREEN_X11 (screen)->xscreen)
#define GDK_SCREEN_XNUMBER(screen) (GDK_SCREEN_X11 (screen)->screen_num)
@@ -93,8 +90,6 @@ gint gdk_x11_get_default_screen (void);
#define GDK_WINDOW_XDISPLAY(win) (gdk_x11_drawable_get_xdisplay (gdk_x11_window_get_drawable_impl (win)))
#define GDK_WINDOW_XID(win) (gdk_x11_drawable_get_xid (win))
#define GDK_WINDOW_XWINDOW(win) (gdk_x11_drawable_get_xid (win))
-#define GDK_PIXMAP_XDISPLAY(win) (gdk_x11_drawable_get_xdisplay (gdk_x11_pixmap_get_drawable_impl (win)))
-#define GDK_PIXMAP_XID(win) (gdk_x11_drawable_get_xid (win))
#define GDK_DRAWABLE_XDISPLAY(win) (gdk_x11_drawable_get_xdisplay (win))
#define GDK_DRAWABLE_XID(win) (gdk_x11_drawable_get_xid (win))
#define GDK_SCREEN_XDISPLAY(screen) (gdk_x11_display_get_xdisplay (gdk_screen_get_display (screen)))
diff --git a/gdk/x11/gdkxid.c b/gdk/x11/gdkxid.c
index 21d876c..637068c 100644
--- a/gdk/x11/gdkxid.c
+++ b/gdk/x11/gdkxid.c
@@ -78,9 +78,8 @@ _gdk_xid_table_remove (GdkDisplay *display,
*
* Returns the GDK object associated with the given X id.
*
- * Return value: the associated Gdk object, which may be a #GdkPixmap,
- * a #GdkWindow or %NULL if no object is associated
- * with the X id.
+ * Return value: the associated #GdkWindow or %NULL if no
+ * object is associated with the X id.
*
* Since: 2.2
*/
@@ -109,9 +108,8 @@ gdk_xid_table_lookup_for_display (GdkDisplay *display,
* Returns the Gdk object associated with the given X id for the default
* display.
*
- * Return value: the associated Gdk object, which may be a #GdkPixmap,
- * a #GdkWindow or %NULL if no object is associated
- * with the X id.
+ * Return value: the associated #GdkWindow or %NULL if no
+ * object is associated with the X id.
*/
gpointer
gdk_xid_table_lookup (XID xid)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
