From 61ca241924aeb563c8a86206581af7f151504963 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 6 Apr 1998 04:31:15 +0000 Subject: [PATCH] Make tab key move in reading order (left-to-right top to bottom) - which Mon Apr 6 00:28:28 1998 Owen Taylor * gtk/gtkcontainer.c (gtk_container_focus_tab): Make tab key move in reading order (left-to-right top to bottom) - which might have been the original intended behavior modulo sorting bugs. * gtk-config.in: Never output -I/usr/include from --cflags --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk-config.in | 7 ++++--- gtk/gtkcontainer.c | 2 +- 9 files changed, 68 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12ad900cd2..e97eebc8cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Mon Apr 6 00:28:28 1998 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_focus_tab): Make + tab key move in reading order (left-to-right top + to bottom) - which might have been the original intended + behavior modulo sorting bugs. + + * gtk-config.in: Never output -I/usr/include from --cflags + Sun Apr 5 21:47:12 1998 Owen Taylor * gtk/gtkmenubar.c: Fixed bug where right justified diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 12ad900cd2..e97eebc8cf 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Mon Apr 6 00:28:28 1998 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_focus_tab): Make + tab key move in reading order (left-to-right top + to bottom) - which might have been the original intended + behavior modulo sorting bugs. + + * gtk-config.in: Never output -I/usr/include from --cflags + Sun Apr 5 21:47:12 1998 Owen Taylor * gtk/gtkmenubar.c: Fixed bug where right justified diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 12ad900cd2..e97eebc8cf 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Mon Apr 6 00:28:28 1998 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_focus_tab): Make + tab key move in reading order (left-to-right top + to bottom) - which might have been the original intended + behavior modulo sorting bugs. + + * gtk-config.in: Never output -I/usr/include from --cflags + Sun Apr 5 21:47:12 1998 Owen Taylor * gtk/gtkmenubar.c: Fixed bug where right justified diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 12ad900cd2..e97eebc8cf 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Mon Apr 6 00:28:28 1998 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_focus_tab): Make + tab key move in reading order (left-to-right top + to bottom) - which might have been the original intended + behavior modulo sorting bugs. + + * gtk-config.in: Never output -I/usr/include from --cflags + Sun Apr 5 21:47:12 1998 Owen Taylor * gtk/gtkmenubar.c: Fixed bug where right justified diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 12ad900cd2..e97eebc8cf 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Mon Apr 6 00:28:28 1998 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_focus_tab): Make + tab key move in reading order (left-to-right top + to bottom) - which might have been the original intended + behavior modulo sorting bugs. + + * gtk-config.in: Never output -I/usr/include from --cflags + Sun Apr 5 21:47:12 1998 Owen Taylor * gtk/gtkmenubar.c: Fixed bug where right justified diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 12ad900cd2..e97eebc8cf 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Mon Apr 6 00:28:28 1998 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_focus_tab): Make + tab key move in reading order (left-to-right top + to bottom) - which might have been the original intended + behavior modulo sorting bugs. + + * gtk-config.in: Never output -I/usr/include from --cflags + Sun Apr 5 21:47:12 1998 Owen Taylor * gtk/gtkmenubar.c: Fixed bug where right justified diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 12ad900cd2..e97eebc8cf 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Mon Apr 6 00:28:28 1998 Owen Taylor + + * gtk/gtkcontainer.c (gtk_container_focus_tab): Make + tab key move in reading order (left-to-right top + to bottom) - which might have been the original intended + behavior modulo sorting bugs. + + * gtk-config.in: Never output -I/usr/include from --cflags + Sun Apr 5 21:47:12 1998 Owen Taylor * gtk/gtkmenubar.c: Fixed bug where right justified diff --git a/gtk-config.in b/gtk-config.in index eb191f2e07..029c7be2e9 100644 --- a/gtk-config.in +++ b/gtk-config.in @@ -39,11 +39,12 @@ while test $# -gt 0; do echo @GTK_VERSION@ ;; --cflags) - libdir=@libdir@ - echo -I$libdir/glib/include -I@includedir@ @x_cflags@ + if test @includedir@ != /usr/include ; then + includes=-I@includedir@ + fi + echo -I@libdir@/glib/include $includes @x_cflags@ ;; --libs) - libdir=@libdir@ echo -L@libdir@ @x_ldflags@ -lgtk -lgdk -lglib @x_libs@ -lm ;; *) diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c index 3d2b8a1245..f8adbe3a71 100644 --- a/gtk/gtkcontainer.c +++ b/gtk/gtkcontainer.c @@ -720,7 +720,7 @@ gtk_container_focus_tab (GtkContainer *container, { child2 = tmp_list->prev->data; if ((child->allocation.x < child2->allocation.x) && - (child->allocation.y >= child2->allocation.y)) + (child->allocation.y == child2->allocation.y)) { tmp_list->data = tmp_list->prev->data; tmp_list = tmp_list->prev;