diff options
| author | Owen Taylor <otaylor@redhat.com> | 1999-11-08 21:25:04 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1999-11-08 21:25:04 +0000 |
| commit | 5491cd971d8768c534e51d9a22040be8abb46bfc (patch) | |
| tree | c903a968f6c7f7e492996487ba797f52f9257248 /gdk/x11 | |
| parent | e9b6bfcc01c0d76c2e5392a0d332bd0d00544ae7 (diff) | |
| download | gtk+-5491cd971d8768c534e51d9a22040be8abb46bfc.tar.gz | |
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
Diffstat (limited to 'gdk/x11')
| -rw-r--r-- | gdk/x11/Makefile.am | 2 | ||||
| -rw-r--r-- | gdk/x11/gdkinput-gxi.c | 9 | ||||
| -rw-r--r-- | gdk/x11/gdkinput-none.c | 2 | ||||
| -rw-r--r-- | gdk/x11/gdkinput-xfree.c | 1 | ||||
| -rw-r--r-- | gdk/x11/gdkinputprivate.h | 3 |
5 files changed, 13 insertions, 4 deletions
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index 6f9c12e429..6fe3679848 100644 --- 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 982e85c7c8..b73b674fe5 100644 --- 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 f04ef190ea..d3aba3dd93 100644 --- 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 6cb6d87b6d..ca3e578c2e 100644 --- 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 d1f8a66d14..2efbcb1283 100644 --- 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> |