Add missing include, fix GdkWindowPrivate => GdkDrawablePrivate.

Mon Nov  8 16:18:25 1999  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkinput-gxi.c: Add missing include,
	  fix GdkWindowPrivate => GdkDrawablePrivate.

	* gdk/x11/gdkinputprivate.h: include <X11/Xlib.h>.

	* gdk/x11/Makefile.am (xinput_sources): Add missing
	backslash to fix building with --with-xinput=none

ChangeLog

@@ -1,3 +1,13 @@
+Mon Nov  8 16:18:25 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkinput-gxi.c: Add missing include,
+	  fix GdkWindowPrivate => GdkDrawablePrivate.
+
+	* gdk/x11/gdkinputprivate.h: include <X11/Xlib.h>.
+
+	* gdk/x11/Makefile.am (xinput_sources): Add missing
+	backslash to fix building with --with-xinput=none
+
 Mon Nov  8 14:47:04 1999  Owen Taylor  <otaylor@redhat.com>
 
 	Move all X specific code into the x11/ directory.

ChangeLog.pre-2-0

@@ -1,3 +1,13 @@
+Mon Nov  8 16:18:25 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkinput-gxi.c: Add missing include,
+	  fix GdkWindowPrivate => GdkDrawablePrivate.
+
+	* gdk/x11/gdkinputprivate.h: include <X11/Xlib.h>.
+
+	* gdk/x11/Makefile.am (xinput_sources): Add missing
+	backslash to fix building with --with-xinput=none
+
 Mon Nov  8 14:47:04 1999  Owen Taylor  <otaylor@redhat.com>
 
 	Move all X specific code into the x11/ directory.

ChangeLog.pre-2-10

@@ -1,3 +1,13 @@
+Mon Nov  8 16:18:25 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkinput-gxi.c: Add missing include,
+	  fix GdkWindowPrivate => GdkDrawablePrivate.
+
+	* gdk/x11/gdkinputprivate.h: include <X11/Xlib.h>.
+
+	* gdk/x11/Makefile.am (xinput_sources): Add missing
+	backslash to fix building with --with-xinput=none
+
 Mon Nov  8 14:47:04 1999  Owen Taylor  <otaylor@redhat.com>
 
 	Move all X specific code into the x11/ directory.

ChangeLog.pre-2-2

@@ -1,3 +1,13 @@
+Mon Nov  8 16:18:25 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkinput-gxi.c: Add missing include,
+	  fix GdkWindowPrivate => GdkDrawablePrivate.
+
+	* gdk/x11/gdkinputprivate.h: include <X11/Xlib.h>.
+
+	* gdk/x11/Makefile.am (xinput_sources): Add missing
+	backslash to fix building with --with-xinput=none
+
 Mon Nov  8 14:47:04 1999  Owen Taylor  <otaylor@redhat.com>
 
 	Move all X specific code into the x11/ directory.

ChangeLog.pre-2-4

@@ -1,3 +1,13 @@
+Mon Nov  8 16:18:25 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkinput-gxi.c: Add missing include,
+	  fix GdkWindowPrivate => GdkDrawablePrivate.
+
+	* gdk/x11/gdkinputprivate.h: include <X11/Xlib.h>.
+
+	* gdk/x11/Makefile.am (xinput_sources): Add missing
+	backslash to fix building with --with-xinput=none
+
 Mon Nov  8 14:47:04 1999  Owen Taylor  <otaylor@redhat.com>
 
 	Move all X specific code into the x11/ directory.

ChangeLog.pre-2-6

@@ -1,3 +1,13 @@
+Mon Nov  8 16:18:25 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkinput-gxi.c: Add missing include,
+	  fix GdkWindowPrivate => GdkDrawablePrivate.
+
+	* gdk/x11/gdkinputprivate.h: include <X11/Xlib.h>.
+
+	* gdk/x11/Makefile.am (xinput_sources): Add missing
+	backslash to fix building with --with-xinput=none
+
 Mon Nov  8 14:47:04 1999  Owen Taylor  <otaylor@redhat.com>
 
 	Move all X specific code into the x11/ directory.

ChangeLog.pre-2-8

@@ -1,3 +1,13 @@
+Mon Nov  8 16:18:25 1999  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkinput-gxi.c: Add missing include,
+	  fix GdkWindowPrivate => GdkDrawablePrivate.
+
+	* gdk/x11/gdkinputprivate.h: include <X11/Xlib.h>.
+
+	* gdk/x11/Makefile.am (xinput_sources): Add missing
+	backslash to fix building with --with-xinput=none
+
 Mon Nov  8 14:47:04 1999  Owen Taylor  <otaylor@redhat.com>
 
 	Move all X specific code into the x11/ directory.

docs/gdk.texi

@@ -1,4 +1,4 @@
-\input texinfo @c -*-texinfo-*-
+b\input texinfo @c -*-texinfo-*-
 @c %**start of header
 @setfilename gdk.info
 @settitle GDK

gdk/x11/Makefile.am

@@ -30,7 +30,7 @@ xinput_sources =	   \
 	gdkinput-x11.c	   \
 	gdkinput-xfree.c
 else
-xinput_sources =
+xinput_sources =	   \
 	gdkinput-none.c
 endif
 endif

gdk/x11/gdkinput-gxi.c

@@ -24,6 +24,11 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+#include <stdlib.h>
+
+#include "gdkinputprivate.h"
+#include "gdkx.h"
+
 /* #define DEBUG_SWITCHING */
 
 #include <gxid_lib.h>
@@ -312,8 +317,8 @@ gdk_input_gxi_other_event (GdkEvent *event,
   if (return_val > 0 && event->type == GDK_MOTION_NOTIFY &&
       (!gdkdev->button_state) && (!input_window->grabbed) &&
       ((event->motion.x < 0) || (event->motion.y < 0) ||
-       (event->motion.x > ((GdkWindowPrivate *)window)->width) || 
+       (event->motion.x > ((GdkDrawablePrivate *)window)->width) || 
-       (event->motion.y > ((GdkWindowPrivate *)window)->height) ||
+       (event->motion.y > ((GdkDrawablePrivate *)window)->height) ||
        gdk_input_is_obscured(input_window,event->motion.x,event->motion.y)))
     {
 #ifdef DEBUG_SWITCHING

gdk/x11/gdkinput-none.c

@@ -17,6 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "gdkinputprivate.h"
+
 /*
  * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog

gdk/x11/gdkinput-xfree.c

@@ -18,7 +18,6 @@
  */
 
 #include "gdkinputprivate.h"
-#include "gdkx.h"
 
 /*
  * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS

gdk/x11/gdkinputprivate.h

@@ -30,6 +30,9 @@
 #include "config.h"
 #include "gdkinput.h"
 #include "gdkevents.h"
+#include "gdkx.h"
+
+#include <X11/Xlib.h>
 
 #ifndef XINPUT_NONE
 #include <X11/extensions/XInput.h>