gdk/: fully remove gdkalias hacks

[~andy/gtk] / gdk / gdkimage.c

diff --git a/gdk/gdkimage.c b/gdk/gdkimage.c
index 7b04925ffbb768d89d3a16813ede79b3ecab7747..3cc2cb48e996cf550e4e8a67beaa51f2257e0578 100644 (file)
--- a/gdk/gdkimage.c
+++ b/gdk/gdkimage.c
@@ -32,7 +32,6 @@
 #include "gdkimage.h"
 #include "gdkprivate.h"
 #include "gdkinternals.h"      /* For scratch_image code */
-#include "gdkalias.h"
 
 /**
  * gdk_image_set_colormap:
@@ -243,6 +242,24 @@ gdk_image_get_bits_per_pixel (GdkImage *image)
   return image->bits_per_pixel;
 }
 
+/**
+ * gdk_image_get_pixels:
+ * @image: a #GdkImage
+ *
+ * Returns a pointer to the pixel data of the image.
+ *
+ * Returns: the pixel data of the image
+ *
+ * Since: 2.22
+ */
+gpointer
+gdk_image_get_pixels (GdkImage *image)
+{
+  g_return_val_if_fail (GDK_IS_IMAGE (image), NULL);
+
+  return image->mem;
+}
+
 /* We have N_REGION GDK_SCRATCH_IMAGE_WIDTH x GDK_SCRATCH_IMAGE_HEIGHT regions divided
  * up between n_images different images. possible_n_images gives
  * various divisors of N_REGIONS. The reason for allowing this
@@ -547,6 +564,3 @@ gdk_image_new (GdkImageType  type,
   return _gdk_image_new_for_depth (gdk_visual_get_screen (visual), type,
                                   visual, width, height, -1);
 }
-
-#define __GDK_IMAGE_C__
-#include "gdkaliasdef.c"