Add #ifdef HAVE_WINTAB around wintab.h include.

2001-08-04 Alexander Larsson <alexl@redhat.com>

	* gdk/win32/gdkinput.c:
	Add #ifdef HAVE_WINTAB around wintab.h include.

	* gtk/gtk.def:
	Removed marshals that have been moved to glib.
	Commented out plug and socket. They didn't compile for me
	on win32.

diff --git a/ChangeLog b/ChangeLog
index 87eb999755ed65d0ecdb552c9fe8568d5758cfc8..bd948c8db2f2cb2205ce4b5f2e64f302c8676341 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-08-04 Alexander Larsson <alexl@redhat.com>
+
+       * gdk/win32/gdkinput.c:
+       Add #ifdef HAVE_WINTAB around wintab.h include.
+
+       * gtk/gtk.def:
+       Removed marshals that have been moved to glib.
+       Commented out plug and socket. They didn't compile for me 
+       on win32.
+
 2001-08-04  Hans Breuer  <hans@breuer.org>
 
        * gtk/stocks-icons/makefile.msc : new file

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 87eb999755ed65d0ecdb552c9fe8568d5758cfc8..bd948c8db2f2cb2205ce4b5f2e64f302c8676341 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+2001-08-04 Alexander Larsson <alexl@redhat.com>
+
+       * gdk/win32/gdkinput.c:
+       Add #ifdef HAVE_WINTAB around wintab.h include.
+
+       * gtk/gtk.def:
+       Removed marshals that have been moved to glib.
+       Commented out plug and socket. They didn't compile for me 
+       on win32.
+
 2001-08-04  Hans Breuer  <hans@breuer.org>
 
        * gtk/stocks-icons/makefile.msc : new file

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 87eb999755ed65d0ecdb552c9fe8568d5758cfc8..bd948c8db2f2cb2205ce4b5f2e64f302c8676341 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2001-08-04 Alexander Larsson <alexl@redhat.com>
+
+       * gdk/win32/gdkinput.c:
+       Add #ifdef HAVE_WINTAB around wintab.h include.
+
+       * gtk/gtk.def:
+       Removed marshals that have been moved to glib.
+       Commented out plug and socket. They didn't compile for me 
+       on win32.
+
 2001-08-04  Hans Breuer  <hans@breuer.org>
 
        * gtk/stocks-icons/makefile.msc : new file

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 87eb999755ed65d0ecdb552c9fe8568d5758cfc8..bd948c8db2f2cb2205ce4b5f2e64f302c8676341 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+2001-08-04 Alexander Larsson <alexl@redhat.com>
+
+       * gdk/win32/gdkinput.c:
+       Add #ifdef HAVE_WINTAB around wintab.h include.
+
+       * gtk/gtk.def:
+       Removed marshals that have been moved to glib.
+       Commented out plug and socket. They didn't compile for me 
+       on win32.
+
 2001-08-04  Hans Breuer  <hans@breuer.org>
 
        * gtk/stocks-icons/makefile.msc : new file

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 87eb999755ed65d0ecdb552c9fe8568d5758cfc8..bd948c8db2f2cb2205ce4b5f2e64f302c8676341 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+2001-08-04 Alexander Larsson <alexl@redhat.com>
+
+       * gdk/win32/gdkinput.c:
+       Add #ifdef HAVE_WINTAB around wintab.h include.
+
+       * gtk/gtk.def:
+       Removed marshals that have been moved to glib.
+       Commented out plug and socket. They didn't compile for me 
+       on win32.
+
 2001-08-04  Hans Breuer  <hans@breuer.org>
 
        * gtk/stocks-icons/makefile.msc : new file

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 87eb999755ed65d0ecdb552c9fe8568d5758cfc8..bd948c8db2f2cb2205ce4b5f2e64f302c8676341 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2001-08-04 Alexander Larsson <alexl@redhat.com>
+
+       * gdk/win32/gdkinput.c:
+       Add #ifdef HAVE_WINTAB around wintab.h include.
+
+       * gtk/gtk.def:
+       Removed marshals that have been moved to glib.
+       Commented out plug and socket. They didn't compile for me 
+       on win32.
+
 2001-08-04  Hans Breuer  <hans@breuer.org>
 
        * gtk/stocks-icons/makefile.msc : new file

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 87eb999755ed65d0ecdb552c9fe8568d5758cfc8..bd948c8db2f2cb2205ce4b5f2e64f302c8676341 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2001-08-04 Alexander Larsson <alexl@redhat.com>
+
+       * gdk/win32/gdkinput.c:
+       Add #ifdef HAVE_WINTAB around wintab.h include.
+
+       * gtk/gtk.def:
+       Removed marshals that have been moved to glib.
+       Commented out plug and socket. They didn't compile for me 
+       on win32.
+
 2001-08-04  Hans Breuer  <hans@breuer.org>
 
        * gtk/stocks-icons/makefile.msc : new file

diff --git a/gdk/win32/gdkinput.c b/gdk/win32/gdkinput.c
index f00970e39ee1a0537ae18a48877e06e321c89481..7d9567e4b032967507d9ce1bf094de0b206f9b09 100644 (file)
--- a/gdk/win32/gdkinput.c
+++ b/gdk/win32/gdkinput.c
@@ -42,7 +42,9 @@
  */
 
 #include <windows.h>
+#ifdef HAVE_WINTAB
 #include <wintab.h>
+#endif
 #include "gdkinput-win32.h"
 
 static GdkDeviceAxis gdk_input_core_axes[] = {

diff --git a/gtk/gtk.def b/gtk/gtk.def
index 5bc50a692b6f145d8b8c09c23b8b83f73fc5b02f..5595913f9686333b29dbe39d8a0d7eb18259d081 100755 (executable)
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -856,15 +856,12 @@ EXPORTS
        gtk_marshal_BOOLEAN__VOID
        gtk_marshal_ENUM__ENUM
        gtk_marshal_INT__POINTER
-       gtk_marshal_VOID__BOOLEAN
-       gtk_marshal_VOID__BOXED
        gtk_marshal_VOID__BOXED_BOXED
        gtk_marshal_VOID__BOXED_OBJECT
        gtk_marshal_VOID__BOXED_STRING_INT
        gtk_marshal_VOID__BOXED_UINT
        gtk_marshal_VOID__BOXED_UINT_FLAGS
        gtk_marshal_VOID__BOXED_UINT_UINT
-       gtk_marshal_VOID__ENUM
        gtk_marshal_VOID__ENUM_FLOAT
        gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN
        gtk_marshal_VOID__ENUM_INT
@@ -1044,10 +1041,10 @@ EXPORTS
        gtk_pixmap_new
        gtk_pixmap_set
        gtk_pixmap_set_build_insensitive
-       gtk_plug_construct
-       gtk_plug_get_id
-       gtk_plug_get_type
-       gtk_plug_new
+;      gtk_plug_construct
+;      gtk_plug_get_id
+;      gtk_plug_get_type
+;      gtk_plug_new
        gtk_preview_draw_row
        gtk_preview_get_cmap
        gtk_preview_get_info
@@ -1222,11 +1219,11 @@ EXPORTS
        gtk_size_group_new
        gtk_size_group_remove_widget
        gtk_size_group_set_mode
-       gtk_socket_add_id
-       gtk_socket_get_id
-       gtk_socket_get_type
-       gtk_socket_new
-       gtk_socket_steal
+;      gtk_socket_add_id
+;      gtk_socket_get_id
+;      gtk_socket_get_type
+;      gtk_socket_new
+;      gtk_socket_steal
        gtk_spin_button_configure
        gtk_spin_button_get_adjustment
        gtk_spin_button_get_digits