From 617e17da3fb1033354ba985de90c93b8e4ee6de1 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 19 Aug 2000 21:46:05 +0000 Subject: gdk/gdkimage.h No need any longer on Win32 for the shared memory 2000-08-20 Tor Lillqvist * 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. --- gtk/gtkmain.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gtk/gtkmain.h') diff --git a/gtk/gtkmain.h b/gtk/gtkmain.h index dcee5f5efc..08c01c74a5 100644 --- a/gtk/gtkmain.h +++ b/gtk/gtkmain.h @@ -81,8 +81,28 @@ gchar* gtk_check_version (guint required_major, void gtk_init (int *argc, char ***argv); + gboolean gtk_init_check (int *argc, char ***argv); +#ifdef G_OS_WIN32 + +/* Variants that are used to check for correct struct packing + * when building GTK+-using code. + */ +void gtk_init_abi_check (int *argc, + char ***argv, + int num_checks, + size_t sizeof_GtkWindow); +gboolean gtk_init_check_abi_check (int *argc, + char ***argv, + int num_checks, + size_t sizeof_GtkWindow); + +#define gtk_init(argc, argv) gtk_init_abi_check (argc, argv, 1, sizeof (GtkWindow)) +#define gtk_init_check(args, argv) gtk_init_check_abi_check (argc, argv, 1, sizeof (GtkWindow)) + +#endif + void gtk_exit (gint error_code); gchar* gtk_set_locale (void); gchar* gtk_get_default_language (void); -- cgit v1.2.1