summaryrefslogtreecommitdiff
path: root/gdk/gdkimage.h
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2000-08-19 21:46:05 +0000
committerTor Lillqvist <tml@src.gnome.org>2000-08-19 21:46:05 +0000
commit617e17da3fb1033354ba985de90c93b8e4ee6de1 (patch)
treeabdd5bdc50ff43d8df2e884a9eb4efdfbbca59d3 /gdk/gdkimage.h
parent41885abc7c911b647826f3cf707b9f70559de102 (diff)
downloadgtk+-617e17da3fb1033354ba985de90c93b8e4ee6de1.tar.gz
gdk/gdkimage.h No need any longer on Win32 for the shared memory
2000-08-20 Tor Lillqvist <tml@iki.fi> * gdk/gdkimage.h * gdk/win32/gdkimage-win32.c: No need any longer on Win32 for the shared memory image+pixmap GdkImage type, or gdk_image_bitmap_new(). They were used in the gdk_imlib port, but I am dropping that. * gtk/gtkmain.h: On Win32, use a #define to map gtk_init() to actually call gtk_init_abi_check(), passing also sizeof(GtkWindow). Ditto for gtk_init_check(). * gtk/gtk.def * gtk/gtkmain.c: (gtk_init_abi_check, gtk_init_check_abi_check): New functions, used to check that the GTK+-using code has been compiled using the correct compiler and switches. In particular, with gcc one has to use the -fnative-struct switch as GTK+ is compiled with that.
Diffstat (limited to 'gdk/gdkimage.h')
-rw-r--r--gdk/gdkimage.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/gdk/gdkimage.h b/gdk/gdkimage.h
index ee0154e210..67011eb996 100644
--- a/gdk/gdkimage.h
+++ b/gdk/gdkimage.h
@@ -17,16 +17,12 @@ extern "C" {
* for both the X server and the program to be reading/writing
* the image simultaneously and producing undesired results.
* On Win32, also a bitmap.
- * Shared Pixmap: Also a shared memory image, which also has a
- * pixmap using the same memory. Used by gdk_imlib with the
- * Win32 backend.
*/
typedef enum
{
GDK_IMAGE_NORMAL,
GDK_IMAGE_SHARED,
- GDK_IMAGE_FASTEST,
- GDK_IMAGE_SHARED_PIXMAP
+ GDK_IMAGE_FASTEST
} GdkImageType;
typedef struct _GdkImageClass GdkImageClass;
@@ -70,13 +66,7 @@ GdkImage* gdk_image_new (GdkImageType type,
GdkVisual *visual,
gint width,
gint height);
-#ifdef GDK_WINDOWING_WIN32
-GdkImage* gdk_image_bitmap_new(GdkImageType type,
- GdkVisual *visual,
- gint width,
- gint height);
-#endif
GdkImage* gdk_image_get (GdkDrawable *drawable,
gint x,
gint y,