From 0b4d29fd6e88bdbf70ee30e2743f4ecf9032e250 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 17 Mar 1999 23:02:10 +0000 Subject: Merge in Win32 version: Define macro GDKVAR for declaring gdk variables * gdk/gdktypes.h: Merge in Win32 version: Define macro GDKVAR for declaring gdk variables exported/imported from the DLL. New image type enum, GDK_IMAGE_SHARED_PIXMAP, for gdk_imlib. New drag and drop protocol enums, GDK_DRAG_PROTO_WIN32_DROPFILES and GDK_DRAG_PROTO_OLE2. * gdk/gdk.h: Merge in Win32 version: Two new functions, gdk_pixmap_create_on_shared_image and gdk_image_bitmap_new. So far declared only for the Win32 version, but could be in the X11 version as well. (Needed for a Xlib-less gdk_imlib.) gdk_color_hash should have only one parameter. Declare gdk_threads_mutex with GDKVAR. * gdk/gdkcolor.c (gdk_color_hash): As a hash function should have just one parameter. * gdk/gdkimage.c (gdk_image_get): Initialize bpp correctly. Bytes per pixel, not bits. * gdk/gdkrgb.c: Mingle includes somewhat. (gdk_rgb_select_conv): Fetch bpp (which means bits-per-pixel here) from another place on Win32. Accept also depth==32 (which we might get on Win32) with bpp==32. * gtk/{gtkclist,gtkctree,gtkdnd,gtkditable,gtkfontsel, gtkhandlebox,gtklayout,gtkmain,gtkplug,gtkpreview,gtkrc, gtkselection,gtksocket,gtkstyle,gtkwidget,gtkwindow}.c: Include gdx.h from "gdkx.h", not "gdk/gdkx.h", as gdkx.h will be in the backend-dependent directory, not in the common gdk directory. * gtk/testgtk.c: Ditto. Also, don't use ../gdk patchs to gdk headers. --- ChangeLog.pre-2-6 | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'ChangeLog.pre-2-6') diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e2079afb45..ac50b97a15 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,39 @@ +1999-03-18 Tor Lillqvist + + * gdk/gdktypes.h: Merge in Win32 version: Define macro GDKVAR for + declaring gdk variables exported/imported from the DLL. New image + type enum, GDK_IMAGE_SHARED_PIXMAP, for gdk_imlib. New drag and + drop protocol enums, GDK_DRAG_PROTO_WIN32_DROPFILES and + GDK_DRAG_PROTO_OLE2. + + * gdk/gdk.h: Merge in Win32 version: Two new functions, + gdk_pixmap_create_on_shared_image and gdk_image_bitmap_new. So far + declared only for the Win32 version, but could be in the X11 + version as well. (Needed for a Xlib-less gdk_imlib.) + gdk_color_hash should have only one parameter. Declare + gdk_threads_mutex with GDKVAR. + + * gdk/gdkcolor.c (gdk_color_hash): As a hash function should have + just one parameter. + + * gdk/gdkimage.c (gdk_image_get): Initialize bpp correctly. Bytes + per pixel, not bits. + + * gdk/gdkrgb.c: Mingle includes somewhat. (gdk_rgb_select_conv): + Fetch bpp (which means bits-per-pixel here) from another place on + Win32. Accept also depth==32 (which we might get on Win32) with + bpp==32. + + * gtk/{gtkclist,gtkctree,gtkdnd,gtkditable,gtkfontsel, + gtkhandlebox,gtklayout,gtkmain,gtkplug,gtkpreview,gtkrc, + gtkselection,gtksocket,gtkstyle,gtkwidget,gtkwindow}.c: + Include gdx.h from "gdkx.h", not "gdk/gdkx.h", as gdkx.h will be + in the backend-dependent directory, not in the common gdk + directory. + + * gtk/testgtk.c: Ditto. Also, don't use ../gdk patchs to gdk + headers. + Wed Mar 17 05:06:49 1999 Tim Janik * gtk/gtkmain.c (gtk_init_check): tell people that they don't really -- cgit v1.2.1