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

diff --git a/ChangeLog b/ChangeLog
index e1aa8e4418b02bc732b6d416530a7e1421e37e0f..2c5eb4aec2bd8efd50f1f2aac82afb404e01b713 100644 (file)
--- a/ChangeLog
+++ b/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.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e1aa8e4418b02bc732b6d416530a7e1421e37e0f..2c5eb4aec2bd8efd50f1f2aac82afb404e01b713 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/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.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e1aa8e4418b02bc732b6d416530a7e1421e37e0f..2c5eb4aec2bd8efd50f1f2aac82afb404e01b713 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/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.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e1aa8e4418b02bc732b6d416530a7e1421e37e0f..2c5eb4aec2bd8efd50f1f2aac82afb404e01b713 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/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.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e1aa8e4418b02bc732b6d416530a7e1421e37e0f..2c5eb4aec2bd8efd50f1f2aac82afb404e01b713 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/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.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e1aa8e4418b02bc732b6d416530a7e1421e37e0f..2c5eb4aec2bd8efd50f1f2aac82afb404e01b713 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/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.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e1aa8e4418b02bc732b6d416530a7e1421e37e0f..2c5eb4aec2bd8efd50f1f2aac82afb404e01b713 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/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.

diff --git a/docs/gdk.texi b/docs/gdk.texi
index 4e4b84f5d7bb23e5d0fbd13417c8b2c09cc60b0c..e6d24bc6d77a8e1b965ac8d14a74f385e484503e 100644 (file)
--- a/docs/gdk.texi
+++ b/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

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 6f9c12e429df5828da5d306b8e7bcad48b251a34..6fe36798480cddca8cd72421fd5e4c5ec5835d17 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/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

diff --git a/gdk/x11/gdkinput-gxi.c b/gdk/x11/gdkinput-gxi.c
index 982e85c7c8e3078c9917e80a0445ee56c391012c..b73b674fe5fae18acbf1f9036726cf075e224b5e 100644 (file)
--- a/gdk/x11/gdkinput-gxi.c
+++ b/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.y > ((GdkWindowPrivate *)window)->height) ||
+       (event->motion.x > ((GdkDrawablePrivate *)window)->width) || 
+       (event->motion.y > ((GdkDrawablePrivate *)window)->height) ||
        gdk_input_is_obscured(input_window,event->motion.x,event->motion.y)))
     {
 #ifdef DEBUG_SWITCHING

diff --git a/gdk/x11/gdkinput-none.c b/gdk/x11/gdkinput-none.c
index f04ef190ea184a09b0cac424383a4474cc1fe756..d3aba3dd93f3cce8649dc7cd09e17505d678af69 100644 (file)
--- a/gdk/x11/gdkinput-none.c
+++ b/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

diff --git a/gdk/x11/gdkinput-xfree.c b/gdk/x11/gdkinput-xfree.c
index 6cb6d87b6dcd8dc28155f7f2eeebbb5d909208dd..ca3e578c2eebdb89b1ffb409cda3428a5258065c 100644 (file)
--- a/gdk/x11/gdkinput-xfree.c
+++ b/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

diff --git a/gdk/x11/gdkinputprivate.h b/gdk/x11/gdkinputprivate.h
index d1f8a66d140f976d7c9ef814c5333c2067373306..2efbcb12833c21ce573e27bc60971e55d1945c04 100644 (file)
--- a/gdk/x11/gdkinputprivate.h
+++ b/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>