GNOME.org
 

[gtk+/rendering-cleanup: 40/40] API: remove GdkImage

commit db2143b7e6d952840403deb8d334298e791dc85d
Author: Benjamin Otte <otte redhat com>
Date:   Wed Jul 14 00:22:45 2010 +0200

    API: remove GdkImage
    
    It was unused and buggy.

 build/win32/vs9/gdk-win32.vcproj           |    1 -
 build/win32/vs9/gtk+.vsprops               |    1 -
 docs/reference/gdk/gdk-docs.sgml           |    1 -
 docs/reference/gdk/gdk3-sections.txt       |   40 --
 docs/reference/gdk/tmpl/images.sgml        |  228 -----------
 docs/reference/gdk/tmpl/visuals.sgml       |   10 +-
 docs/reference/gdk/tmpl/x_interaction.sgml |   36 --
 gdk/Makefile.am                            |    2 -
 gdk/directfb/Makefile.am                   |    1 -
 gdk/directfb/TODO                          |    1 -
 gdk/directfb/gdkdisplay-directfb.c         |    1 -
 gdk/directfb/gdkimage-directfb.c           |  335 ----------------
 gdk/directfb/gdkprivate-directfb.h         |    6 -
 gdk/gdk.h                                  |    1 -
 gdk/gdk.symbols                            |   32 --
 gdk/gdkimage.c                             |  566 ----------------------------
 gdk/gdkimage.h                             |  126 ------
 gdk/gdkinternals.h                         |   17 -
 gdk/gdktypes.h                             |    1 -
 gdk/makefile.msc                           |    2 -
 gdk/quartz/Makefile.am                     |    1 -
 gdk/quartz/gdkimage-quartz.c               |  152 --------
 gdk/win32/Makefile.am                      |    1 -
 gdk/win32/gdkdisplay-win32.c               |    1 -
 gdk/win32/gdkdrawable-win32.c              |    3 +-
 gdk/win32/gdkimage-win32.c                 |  363 ------------------
 gdk/win32/gdkprivate-win32.h               |    7 -
 gdk/win32/makefile.msc                     |    1 -
 gdk/x11/Makefile.am                        |    1 -
 gdk/x11/gdkcolor-x11.c                     |    4 +-
 gdk/x11/gdkdisplay-x11.c                   |    2 -
 gdk/x11/gdkdisplay-x11.h                   |    2 -
 gdk/x11/gdkimage-x11.c                     |  564 ---------------------------
 gdk/x11/gdkprivate-x11.h                   |    3 -
 gdk/x11/gdkx.h                             |    4 -
 35 files changed, 3 insertions(+), 2514 deletions(-)
---
diff --git a/build/win32/vs9/gdk-win32.vcproj b/build/win32/vs9/gdk-win32.vcproj
index cb233b4..1d6169c 100644
--- a/build/win32/vs9/gdk-win32.vcproj
+++ b/build/win32/vs9/gdk-win32.vcproj
@@ -134,7 +134,6 @@
 			<File RelativePath="..\..\..\gdk\win32\gdkgeometry-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkglobals-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkim-win32.c" />
-			<File RelativePath="..\..\..\gdk\win32\gdkimage-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkinput-win32.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkinput.c" />
 			<File RelativePath="..\..\..\gdk\win32\gdkkeys-win32.c" />
diff --git a/build/win32/vs9/gtk+.vsprops b/build/win32/vs9/gtk+.vsprops
index 95971f0..ce196f8 100644
--- a/build/win32/vs9/gtk+.vsprops
+++ b/build/win32/vs9/gtk+.vsprops
@@ -108,7 +108,6 @@ copy ..\..\..\gdk\gdkevents.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#
 copy ..\..\..\gdk\gdkfont.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkgc.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdki18n.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkimage.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkinput.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkkeys.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
 copy ..\..\..\gdk\gdkkeysyms.h $(OutDir)\include\gtk-$(GtkApiVersion)\gdk&#x0D;&#x0A;
diff --git a/docs/reference/gdk/gdk-docs.sgml b/docs/reference/gdk/gdk-docs.sgml
index 76d8272..765223f 100644
--- a/docs/reference/gdk/gdk-docs.sgml
+++ b/docs/reference/gdk/gdk-docs.sgml
@@ -28,7 +28,6 @@
     <xi:include href="xml/drawing.xml" />
 
     <xi:include href="xml/pixmaps.xml" />
-    <xi:include href="xml/images.xml" />
     <xi:include href="xml/pixbufs.xml" />
 
     <xi:include href="xml/colors.xml" />
diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index 6b46e18..7fc0d5a 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -79,7 +79,6 @@ gdk_gc_values_mask_get_type
 gdk_grab_ownership_get_type
 gdk_grab_status_get_type
 gdk_gravity_get_type
-gdk_image_type_get_type
 gdk_input_mode_get_type
 gdk_input_source_get_type
 gdk_join_style_get_type
@@ -275,43 +274,6 @@ GdkPixmapObjectClass
 </SECTION>
 
 <SECTION>
-<TITLE>Images</TITLE>
-<FILE>images</FILE>
-GdkImage
-gdk_image_new
-GdkImageType
-gdk_image_get_colormap
-gdk_image_set_colormap
-gdk_image_get_bits_per_pixel
-gdk_image_get_bytes_per_pixel
-gdk_image_get_bytes_per_line
-gdk_image_get_byte_order
-gdk_image_get_depth
-gdk_image_get_height
-gdk_image_get_image_type
-gdk_image_get_visual
-gdk_image_get_width
-gdk_image_get_pixels
-
-<SUBSECTION>
-gdk_image_put_pixel
-gdk_image_get_pixel
-
-<SUBSECTION Standard>
-GDK_IMAGE
-GDK_TYPE_IMAGE
-GDK_IS_IMAGE
-GDK_IMAGE_CLASS
-GDK_IMAGE_GET_CLASS
-GDK_IS_IMAGE_CLASS
-GDK_TYPE_IMAGE_TYPE
-
-<SUBSECTION Private>
-GdkImageClass
-gdk_image_get_type
-</SECTION>
-
-<SECTION>
 <TITLE>Pixbufs</TITLE>
 <FILE>pixbufs</FILE>
 gdk_pixbuf_render_threshold_alpha
@@ -1175,8 +1137,6 @@ GDK_PIXMAP_XID
 GDK_DISPLAY_XDISPLAY
 GDK_DRAWABLE_XDISPLAY
 GDK_DRAWABLE_XID
-GDK_IMAGE_XDISPLAY
-GDK_IMAGE_XIMAGE
 GDK_GC_XDISPLAY
 GDK_COLORMAP_XDISPLAY
 GDK_COLORMAP_XCOLORMAP
diff --git a/docs/reference/gdk/tmpl/visuals.sgml b/docs/reference/gdk/tmpl/visuals.sgml
index 76ae994..79e9229 100644
--- a/docs/reference/gdk/tmpl/visuals.sgml
+++ b/docs/reference/gdk/tmpl/visuals.sgml
@@ -17,14 +17,6 @@ of an RGB pixel may be in the top 8 bits of the pixel, or may be in the lower
 4 bits.
 </para>
 <para>
-Usually you can avoid thinking about visuals in GTK+. Visuals are useful to
-interpret the contents of a #GdkImage, but you should avoid #GdkImage precisely
-because its contents depend on the display hardware; use #GdkPixbuf instead, for
-all but the most low-level purposes. Also, anytime you provide a #GdkColormap,
-the visual is implied as part of the colormap (gdk_colormap_get_visual()), so
-you won't have to provide a visual in addition.
-</para>
-<para>
 There are several standard visuals. The visual returned
 by gdk_visual_get_system() is the system's default
 visual. gdk_rgb_get_visual() return the visual most
@@ -48,7 +40,7 @@ then %GDK_VISUAL_STATIC_GRAY.
 
 <!-- ##### SECTION See_Also ##### -->
 <para>
-#GdkImage, #GdkColormap, #GdkRGB
+#GdkColormap
 </para>
 
 <!-- ##### SECTION Stability_Level ##### -->
diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml
index 52bd20e..28aae1f 100644
--- a/docs/reference/gdk/tmpl/x_interaction.sgml
+++ b/docs/reference/gdk/tmpl/x_interaction.sgml
@@ -97,24 +97,6 @@ Returns the X resource (window or pixmap) belonging to a #GdkDrawable.
 @Returns: the ID of @win's X resource.
 
 
-<!-- ##### MACRO GDK_IMAGE_XDISPLAY ##### -->
-<para>
-Returns the display of a #GdkImage.
-</para>
-
- image: a #GdkImage.
- Returns: an Xlib <type>Display*</type>.
-
-
-<!-- ##### MACRO GDK_IMAGE_XIMAGE ##### -->
-<para>
-Returns the X image belonging to a #GdkImage.
-</para>
-
- image: a #GdkImage.
- Returns: an <type>XImage*</type>.
-
-
 <!-- ##### MACRO GDK_GC_XDISPLAY ##### -->
 <para>
 Returns the display of a #GdkGC.
@@ -610,24 +592,6 @@ Another name for GDK_DRAWABLE_XID().
 @void: 
 
 
-<!-- ##### FUNCTION gdk_x11_image_get_xdisplay ##### -->
-<para>
-
-</para>
-
- image: 
- Returns: 
-
-
-<!-- ##### FUNCTION gdk_x11_image_get_ximage ##### -->
-<para>
-
-</para>
-
- image: 
- Returns: 
-
-
 <!-- ##### FUNCTION gdk_x11_screen_get_screen_number ##### -->
 <para>
 
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 7b5453b..7cef5d0 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -82,7 +82,6 @@ gdk_public_h_sources =				\
 	gdkdrawable.h				\
 	gdkevents.h				\
 	gdkgc.h					\
-	gdkimage.h				\
 	gdkinput.h				\
 	gdkkeys.h				\
 	gdkkeysyms.h				\
@@ -124,7 +123,6 @@ gdk_c_sources =                 \
 	gdkevents.c     	\
 	gdkgc.c			\
 	gdkglobals.c		\
-	gdkimage.c		\
 	gdkkeys.c		\
 	gdkkeyuni.c		\
 	gdkoffscreenwindow.c	\
diff --git a/gdk/directfb/Makefile.am b/gdk/directfb/Makefile.am
index 57d3fed..a11f9de 100644
--- a/gdk/directfb/Makefile.am
+++ b/gdk/directfb/Makefile.am
@@ -31,7 +31,6 @@ libgdk_directfb_la_SOURCES =	\
 	gdkgeometry-directfb.c	\
 	gdkglobals-directfb.c	\
 	gdkim-directfb.c	\
-	gdkimage-directfb.c	\
 	gdkinput-directfb.c	\
 	gdkinput-directfb.h	\
 	gdkkeys-directfb.c	\
diff --git a/gdk/directfb/TODO b/gdk/directfb/TODO
index 10215d3..2833669 100644
--- a/gdk/directfb/TODO
+++ b/gdk/directfb/TODO
@@ -34,7 +34,6 @@ gdkevents-directfb.c
 gdkgc-directfb.c
 gdkgeometry-directfb.c
 gdkglobals-directfb.c
-gdkimage-directfb.c
 gdkim-directfb.c
 gdkinput-directfb.c
 gdkkeys-directfb.c
diff --git a/gdk/directfb/gdkdisplay-directfb.c b/gdk/directfb/gdkdisplay-directfb.c
index 78026bf..895713f 100644
--- a/gdk/directfb/gdkdisplay-directfb.c
+++ b/gdk/directfb/gdkdisplay-directfb.c
@@ -39,7 +39,6 @@ extern void _gdk_events_init            (void);
 extern void _gdk_input_init             (void);
 extern void _gdk_dnd_init               (void);
 extern void _gdk_windowing_window_init  (void);
-extern void _gdk_windowing_image_init   (void);
 extern void _gdk_directfb_keyboard_init (void);
 
 static gboolean   gdk_directfb_argb_font           = FALSE;
diff --git a/gdk/directfb/gdkprivate-directfb.h b/gdk/directfb/gdkprivate-directfb.h
index a8147d1..9929998 100644
--- a/gdk/directfb/gdkprivate-directfb.h
+++ b/gdk/directfb/gdkprivate-directfb.h
@@ -198,12 +198,6 @@ typedef struct
   DFBSurfacePixelFormat  format;
 } GdkVisualDirectFB;
 
-typedef struct
-{
-  IDirectFBSurface *surface;
-} GdkImageDirectFB;
-
-
 #define GDK_TYPE_GC_DIRECTFB       (_gdk_gc_directfb_get_type ())
 #define GDK_GC_DIRECTFB(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_GC_DIRECTFB, GdkGCDirectFB))
 #define GDK_IS_GC_DIRECTFB(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_GC_DIRECTFB))
diff --git a/gdk/gdk.h b/gdk/gdk.h
index ba74d4d..4ff1e15 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -42,7 +42,6 @@
 #include <gdk/gdkenumtypes.h>
 #include <gdk/gdkevents.h>
 #include <gdk/gdkgc.h>
-#include <gdk/gdkimage.h>
 #include <gdk/gdkinput.h>
 #include <gdk/gdkkeys.h>
 #include <gdk/gdkpango.h>
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 83a30d4..37a632b 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -286,7 +286,6 @@ gdk_window_hints_get_type G_GNUC_CONST
 gdk_window_state_get_type G_GNUC_CONST
 gdk_window_type_get_type G_GNUC_CONST
 gdk_window_type_hint_get_type G_GNUC_CONST
-gdk_image_type_get_type G_GNUC_CONST
 gdk_visual_type_get_type G_GNUC_CONST
 #endif
 #endif
@@ -805,32 +804,6 @@ gdk_window_configure_finished
 #endif
 #endif
 
-#if IN_HEADER(__GDK_IMAGE_H__)
-#if IN_FILE(__GDK_IMAGE_C__)
-gdk_image_get_bits_per_pixel
-gdk_image_get_bytes_per_pixel
-gdk_image_get_bytes_per_line
-gdk_image_get_byte_order
-gdk_image_get_colormap
-gdk_image_get_depth
-gdk_image_get_height
-gdk_image_get_image_type
-gdk_image_get_visual
-gdk_image_get_width
-gdk_image_get_pixels
-gdk_image_set_colormap
-gdk_image_new
-#endif
-#endif
-
-#if IN_HEADER(__GDK_IMAGE_H__)
-#if IN_FILE(__GDK_IMAGE_X11_C__)
-gdk_image_get_pixel
-gdk_image_put_pixel
-gdk_image_get_type G_GNUC_CONST
-#endif
-#endif
-
 #if IN_HEADER(__GDK_KEYS_H__)
 #if IN_FILE(__GDK_KEYS_C__)
 gdk_keymap_get_default
@@ -1185,11 +1158,6 @@ gdk_x11_grab_server
 gdk_x11_ungrab_server
 #endif
 
-#if IN_FILE(__GDK_IMAGE_X11_C__)
-gdk_x11_image_get_xdisplay
-gdk_x11_image_get_ximage
-#endif
-
 #if IN_FILE(__GDK_SCREEN_X11_C__)
 gdk_net_wm_supports
 gdk_x11_screen_get_screen_number
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index f46edd9..157f8a0 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -317,22 +317,6 @@ void gdk_synthesize_window_state (GdkWindow     *window,
 GdkDeviceManager * _gdk_device_manager_new (GdkDisplay *display);
 
 
-#define GDK_SCRATCH_IMAGE_WIDTH 256
-#define GDK_SCRATCH_IMAGE_HEIGHT 64
-
-GdkImage* _gdk_image_new_for_depth (GdkScreen    *screen,
-				    GdkImageType  type,
-				    GdkVisual    *visual,
-				    gint          width,
-				    gint          height,
-				    gint          depth);
-GdkImage *_gdk_image_get_scratch (GdkScreen *screen,
-				  gint	     width,
-				  gint	     height,
-				  gint	     depth,
-				  gint	    *x,
-				  gint	    *y);
-
 cairo_surface_t *_gdk_drawable_ref_cairo_surface (GdkDrawable *drawable);
 
 GdkDrawable *_gdk_drawable_get_source_drawable (GdkDrawable *drawable);
@@ -691,7 +675,6 @@ void       _gdk_offscreen_window_new                 (GdkWindow     *window,
  * Initialization and exit routines *
  ************************************/
 
-void _gdk_image_exit  (void);
 void _gdk_windowing_exit (void);
 
 G_END_DECLS
diff --git a/gdk/gdktypes.h b/gdk/gdktypes.h
index 16a4f91..aaba589 100644
--- a/gdk/gdktypes.h
+++ b/gdk/gdktypes.h
@@ -104,7 +104,6 @@ typedef struct _GdkColor	      GdkColor;
 typedef struct _GdkColormap	      GdkColormap;
 typedef struct _GdkCursor	      GdkCursor;
 typedef struct _GdkGC                 GdkGC;
-typedef struct _GdkImage              GdkImage;
 typedef struct _GdkVisual             GdkVisual;
 
 typedef struct _GdkDrawable           GdkDrawable;
diff --git a/gdk/makefile.msc b/gdk/makefile.msc
index b137a4d..717e2b9 100644
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -75,7 +75,6 @@ gdk_OBJECTS = \
 	gdkevents.obj \
 	gdkgc.obj \
 	gdkglobals.obj \
-	gdkimage.obj \
 	gdkwindowimpl.obj \
 	gdkkeynames.obj \
 	gdkkeys.obj \
@@ -101,7 +100,6 @@ gdk_public_h_sources = \
 	gdkevents.h	\
 	gdkgc.h		\
 	gdkkeysyms.h	\
-	gdkimage.h	\
 	gdkinput.h	\
 	gdkkeys.h	\
 	gdkpango.h	\
diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
index 6a45b48..2681f6d 100644
--- a/gdk/quartz/Makefile.am
+++ b/gdk/quartz/Makefile.am
@@ -36,7 +36,6 @@ libgdk_quartz_la_SOURCES =    	\
 	gdkgeometry-quartz.c	\
 	gdkglobals-quartz.c	\
 	gdkim-quartz.c		\
-	gdkimage-quartz.c	\
 	gdkinput.c		\
 	gdkinputprivate.h	\
 	gdkkeys-quartz.c	\
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 0992473..c6b0f9a 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -44,7 +44,6 @@ libgdk_win32_la_SOURCES = \
 	gdkgeometry-win32.c \
 	gdkglobals-win32.c \
 	gdkim-win32.c \
-	gdkimage-win32.c \
 	gdkinput.c \
 	gdkkeys-win32.c \
 	gdkmain-win32.c \
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 340d243..3295353 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -207,7 +207,6 @@ gdk_display_open (const gchar *display_name)
   gdk_screen_set_default_colormap (_gdk_screen,
                                    gdk_screen_get_system_colormap (_gdk_screen));
   _gdk_windowing_window_init (_gdk_screen);
-  _gdk_windowing_image_init ();
   _gdk_events_init ();
   _gdk_input_init (_gdk_display);
   _gdk_dnd_init ();
diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index b93432e..92fd843 100644
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -1298,8 +1298,7 @@ blit_from_pixmap (gboolean              use_fg_bg,
 		{
 		  /* Destination is also pixmap, get fg and bg from
 		   * its palette. Either use the foreground and
-		   * background pixel values in the GC (only in the
-		   * case of gdk_image_put(), cf. XPutImage()), or 0
+		   * background pixel values in the GC, or 0
 		   * and 1 to index the palette.
 		   */
 		  if (!GDI_CALL (GetDIBColorTable, (hdc, bgix, 1, newtable)) ||
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 0439522..d026d89 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -236,12 +236,6 @@ GdkGC    *_gdk_win32_gc_new             (GdkDrawable        *drawable,
 					 GdkGCValues        *values,
 					 GdkGCValuesMask     values_mask);
 
-GdkImage *_gdk_win32_get_image 		(GdkDrawable *drawable,
-					 gint         x,
-					 gint         y,
-					 gint         width,
-					 gint         height);
-
 void      _gdk_win32_blit               (gboolean              use_fg_bg,
 					 GdkDrawableImplWin32 *drawable,
 					 GdkGC       	       *gc,
@@ -465,7 +459,6 @@ void _gdk_root_window_size_init (void);
 void _gdk_monitor_init(void);
 void _gdk_visual_init (void);
 void _gdk_dnd_init    (void);
-void _gdk_windowing_image_init  (void);
 void _gdk_events_init (void);
 void _gdk_input_init  (GdkDisplay *display);
 
diff --git a/gdk/win32/makefile.msc b/gdk/win32/makefile.msc
index 1b3a993..45a3350 100644
--- a/gdk/win32/makefile.msc
+++ b/gdk/win32/makefile.msc
@@ -42,7 +42,6 @@ gdk_win32_OBJECTS = \
 	gdkgeometry-win32.obj \
 	gdkglobals-win32.obj \
 	gdkim-win32.obj \
-	gdkimage-win32.obj \
 	gdkinput.obj \
 	gdkinput-win32.obj \
 	gdkkeys-win32.obj \
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 31d61a6..080ccd1 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -41,7 +41,6 @@ libgdk_x11_la_SOURCES =    	\
 	gdkgeometry-x11.c  	\
 	gdkglobals-x11.c   	\
 	gdkim-x11.c	   	\
-	gdkimage-x11.c	   	\
 	gdkinput.c		\
 	gdkkeys-x11.c		\
 	gdkmain-x11.c	   	\
diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c
index 0889d32..2d41214 100644
--- a/gdk/x11/gdkcolor-x11.c
+++ b/gdk/x11/gdkcolor-x11.c
@@ -1019,9 +1019,7 @@ gdk_colormap_alloc_colors (GdkColormap *colormap,
  * hardware pixel @pixel. @pixel must be a valid pixel in the
  * colormap; it's a programmer error to call this function with a
  * pixel which is not in the colormap. Hardware pixels are normally
- * obtained from gdk_colormap_alloc_colors(), or from a #GdkImage. (A
- * #GdkImage contains image data in hardware format, a #GdkPixbuf
- * contains image data in a canonical 24-bit RGB format.)
+ * obtained from gdk_colormap_alloc_colors().
  *
  * This function is rarely useful; it's used for example to
  * implement the eyedropper feature in #GtkColorSelection.
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 7195c01..9b61238 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1197,7 +1197,6 @@ gdk_display_open (const gchar *display_name)
   display = g_object_new (GDK_TYPE_DISPLAY_X11, NULL);
   display_x11 = GDK_DISPLAY_X11 (display);
 
-  display_x11->use_xshm = TRUE;
   display_x11->xdisplay = xdisplay;
 
 #ifdef HAVE_X11R6  
@@ -1427,7 +1426,6 @@ gdk_display_open (const gchar *display_name)
   }
 #endif
 
-  _gdk_windowing_image_init (display);
   _gdk_input_init (display);
   _gdk_dnd_init (display);
 
diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index f8a55d0..697632b 100644
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -76,8 +76,6 @@ struct _GdkDisplayX11
   GdkKeymap *keymap;
   guint	    keymap_serial;
 
-  gboolean use_xshm;
-  gboolean have_shm_pixmaps;
   GdkTristate have_render;
   gboolean have_xfixes;
   gint xfixes_event_base;
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index edc3914..e536f86 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -106,8 +106,6 @@ GdkGC *_gdk_x11_gc_new                  (GdkDrawable     *drawable,
 					 GdkGCValues     *values,
 					 GdkGCValuesMask  values_mask);
 
-Pixmap   _gdk_x11_image_get_shm_pixmap (GdkImage    *image);
-
 /* Routines from gdkgeometry-x11.c */
 void _gdk_window_move_resize_child (GdkWindow     *window,
                                     gint           x,
@@ -175,7 +173,6 @@ void _gdk_events_uninit         (GdkDisplay *display);
 void _gdk_windowing_window_init (GdkScreen *screen);
 void _gdk_visual_init           (GdkScreen *screen);
 void _gdk_dnd_init		(GdkDisplay *display);
-void _gdk_windowing_image_init  (GdkDisplay *display);
 
 PangoRenderer *_gdk_x11_renderer_get (GdkDrawable *drawable,
 				      GdkGC       *gc);
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index d23f1fb..44b0ea6 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -42,8 +42,6 @@ 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_image_get_xdisplay       (GdkImage    *image);
-XImage  *gdk_x11_image_get_ximage         (GdkImage    *image);
 Display *gdk_x11_colormap_get_xdisplay    (GdkColormap *colormap);
 Colormap gdk_x11_colormap_get_xcolormap   (GdkColormap *colormap);
 Display *gdk_x11_cursor_get_xdisplay      (GdkCursor   *cursor);
@@ -70,8 +68,6 @@ gint     gdk_x11_get_default_screen       (void);
 #define GDK_COLORMAP_XCOLORMAP(cmap)  (gdk_x11_colormap_get_xcolormap (cmap))
 #define GDK_CURSOR_XDISPLAY(cursor)   (gdk_x11_cursor_get_xdisplay (cursor))
 #define GDK_CURSOR_XCURSOR(cursor)    (gdk_x11_cursor_get_xcursor (cursor))
-#define GDK_IMAGE_XDISPLAY(image)     (gdk_x11_image_get_xdisplay (image))
-#define GDK_IMAGE_XIMAGE(image)       (gdk_x11_image_get_ximage (image))
 
 #ifndef GDK_MULTIHEAD_SAFE
 #define GDK_DISPLAY()                 gdk_display
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]