summaryrefslogtreecommitdiff
path: root/x11/gtk/patches
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gtk/patches')
-rw-r--r--x11/gtk/patches/patch-aa16
-rw-r--r--x11/gtk/patches/patch-ae19
2 files changed, 27 insertions, 8 deletions
diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index 600f8b8192c..505ea5b1fd8 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.21 2001/03/10 10:50:38 drochner Exp $
+$NetBSD: patch-aa,v 1.22 2001/04/26 17:42:55 rh Exp $
---- configure.orig Fri Mar 2 20:34:37 2001
-+++ configure Wed Mar 7 22:16:35 2001
+--- configure.orig Wed Mar 28 23:11:45 2001
++++ configure
@@ -22,8 +22,8 @@
#
GTK_MAJOR_VERSION=1
GTK_MINOR_VERSION=2
--GTK_MICRO_VERSION=9
--GTK_INTERFACE_AGE=0
-+GTK_MICRO_VERSION=21
-+GTK_INTERFACE_AGE=9
- GTK_BINARY_AGE=9
+-GTK_MICRO_VERSION=10
+-GTK_INTERFACE_AGE=1
++GTK_MICRO_VERSION=22
++GTK_INTERFACE_AGE=10
+ GTK_BINARY_AGE=10
GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
ac_help="$ac_help
@@ -4106,7 +4106,7 @@
diff --git a/x11/gtk/patches/patch-ae b/x11/gtk/patches/patch-ae
new file mode 100644
index 00000000000..769e0666abd
--- /dev/null
+++ b/x11/gtk/patches/patch-ae
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.4 2001/04/26 17:42:55 rh Exp $
+
+--- gtk/gtkwindow.c.orig Sat Mar 10 00:39:16 2001
++++ gtk/gtkwindow.c
+@@ -985,7 +985,13 @@
+ break;
+ case EnterNotify:
+ case LeaveNotify:
+- if (xev->xcrossing.detail != NotifyInferior &&
++ /* We only track the actual destination of keyboard events for real
++ * toplevels, not for embedded toplevels such as GtkPlug. The reason for
++ * this is that GtkPlug redirects events so the widget may effectively not
++ * have the focus even if it actually has the focus.
++ */
++ if (gdk_window_get_parent (GTK_WIDGET (window)->window) == GDK_ROOT_PARENT () &&
++ xev->xcrossing.detail != NotifyInferior &&
+ xev->xcrossing.focus && !window->window_has_focus)
+ {
+ window->window_has_pointer_focus = (xev->xany.type == EnterNotify) ? TRUE : FALSE;