callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk/gdkimage.h No need any longer on Win32 for the shared memory

Browse Source 
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.
This commit is contained in:
Tor Lillqvist
2000-08-19 21:46:05 +00:00
committed by Tor Lillqvist
parent 41885abc7c
commit 617e17da3f
12 changed files with 196 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gdk/win32/gdkimage-win32.c
View File

@ -218,9 +218,8 @@ gdk_image_new (GdkImageType type,
GDK_NOTE (MISC, g_print ("gdk_image_new: %dx%d %s\n",
width, height,
(type == GDK_IMAGE_SHARED ? "shared" :
(type == GDK_IMAGE_SHARED_PIXMAP ? "shared_pixmap" :
"???"))));
"???")));
image = g_object_new (gdk_image_get_type (), NULL);
private = PRIVATE_DATA (image);
@ -654,18 +653,10 @@ gdk_win32_image_destroy (GdkImage *image)
return;
GDK_NOTE (MISC, g_print ("gdk_win32_image_destroy: %#x%s\n",
private->hbitmap,
(image->type == GDK_IMAGE_SHARED_PIXMAP ?
" (shared pixmap)" : "")));
private->hbitmap));
switch (image->type)
{
case GDK_IMAGE_SHARED_PIXMAP:
break; /* The Windows bitmap has already been
* (or will be) deleted when freeing
* the corresponding pixmap.
*/
case GDK_IMAGE_SHARED:
if (!DeleteObject (private->hbitmap))
WIN32_GDI_FAILED ("DeleteObject");