Back out event->window test - it wasn't needed because of the call to

Mon Jun  9 16:18:11 2003  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtknotebook.c (gtk_notebook_button_press): Back
        out event->window test - it wasn't needed because
        of the call to get_widget_coordinates().

        * gtk/gtknotebook.c (gtk_notebook_button_press): Remove
        call to gtk_widget_grab_focus() when not clicking on
        any tabs. (Real fix for #114534)

6 files changed, 66 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 636415ab5..49fe6c44a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Jun  9 16:18:11 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+ 	* gtk/gtknotebook.c (gtk_notebook_button_press): Back
+ 	out event->window test - it wasn't needed because
+ 	of the call to get_widget_coordinates().
+
+ 	* gtk/gtknotebook.c (gtk_notebook_button_press): Remove
+ 	call to gtk_widget_grab_focus() when not clicking on
+ 	any tabs. (Real fix for #114534)
+ 
 Mon Jun  9 21:25:13 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
@@ -718,6 +728,9 @@ Mon Apr  7 19:43:15 2003  Owen Taylor  <otaylor@redhat.com>
 
  	* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
  	Use gdk_x11_display_grab/ungrab.
+
+	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize
+	use_xshm to TRUE so SHM gets used when present.
  
 	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize
 	use_xshm to TRUE so SHM gets used when present.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 636415ab5..49fe6c44a 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Mon Jun  9 16:18:11 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+ 	* gtk/gtknotebook.c (gtk_notebook_button_press): Back
+ 	out event->window test - it wasn't needed because
+ 	of the call to get_widget_coordinates().
+
+ 	* gtk/gtknotebook.c (gtk_notebook_button_press): Remove
+ 	call to gtk_widget_grab_focus() when not clicking on
+ 	any tabs. (Real fix for #114534)
+ 
 Mon Jun  9 21:25:13 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
@@ -718,6 +728,9 @@ Mon Apr  7 19:43:15 2003  Owen Taylor  <otaylor@redhat.com>
 
  	* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
  	Use gdk_x11_display_grab/ungrab.
+
+	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize
+	use_xshm to TRUE so SHM gets used when present.
  
 	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize
 	use_xshm to TRUE so SHM gets used when present.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 636415ab5..49fe6c44a 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Mon Jun  9 16:18:11 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+ 	* gtk/gtknotebook.c (gtk_notebook_button_press): Back
+ 	out event->window test - it wasn't needed because
+ 	of the call to get_widget_coordinates().
+
+ 	* gtk/gtknotebook.c (gtk_notebook_button_press): Remove
+ 	call to gtk_widget_grab_focus() when not clicking on
+ 	any tabs. (Real fix for #114534)
+ 
 Mon Jun  9 21:25:13 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
@@ -718,6 +728,9 @@ Mon Apr  7 19:43:15 2003  Owen Taylor  <otaylor@redhat.com>
 
  	* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
  	Use gdk_x11_display_grab/ungrab.
+
+	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize
+	use_xshm to TRUE so SHM gets used when present.
  
 	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize
 	use_xshm to TRUE so SHM gets used when present.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 636415ab5..49fe6c44a 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Mon Jun  9 16:18:11 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+ 	* gtk/gtknotebook.c (gtk_notebook_button_press): Back
+ 	out event->window test - it wasn't needed because
+ 	of the call to get_widget_coordinates().
+
+ 	* gtk/gtknotebook.c (gtk_notebook_button_press): Remove
+ 	call to gtk_widget_grab_focus() when not clicking on
+ 	any tabs. (Real fix for #114534)
+ 
 Mon Jun  9 21:25:13 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
@@ -718,6 +728,9 @@ Mon Apr  7 19:43:15 2003  Owen Taylor  <otaylor@redhat.com>
 
  	* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
  	Use gdk_x11_display_grab/ungrab.
+
+	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize
+	use_xshm to TRUE so SHM gets used when present.
  
 	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize
 	use_xshm to TRUE so SHM gets used when present.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 636415ab5..49fe6c44a 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Mon Jun  9 16:18:11 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+ 	* gtk/gtknotebook.c (gtk_notebook_button_press): Back
+ 	out event->window test - it wasn't needed because
+ 	of the call to get_widget_coordinates().
+
+ 	* gtk/gtknotebook.c (gtk_notebook_button_press): Remove
+ 	call to gtk_widget_grab_focus() when not clicking on
+ 	any tabs. (Real fix for #114534)
+ 
 Mon Jun  9 21:25:13 2003  Kristian Rietveld  <kris@gtk.org>
 
 	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_get_size):
@@ -718,6 +728,9 @@ Mon Apr  7 19:43:15 2003  Owen Taylor  <otaylor@redhat.com>
 
  	* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
  	Use gdk_x11_display_grab/ungrab.
+
+	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize
+	use_xshm to TRUE so SHM gets used when present.
  
 	* gdk/x11/gdkdisplay-x11.c (gdk_display_open): Initialize
 	use_xshm to TRUE so SHM gets used when present.
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 249d958ce..4ffd7b146 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1617,8 +1617,7 @@ gtk_notebook_button_press (GtkWidget      *widget,
   gint num;
   gint x, y;
 
-  if (event->window != notebook->event_window || 
-      event->type != GDK_BUTTON_PRESS || !notebook->children ||
+  if (event->type != GDK_BUTTON_PRESS || !notebook->children ||
       notebook->button)
     return FALSE;
 
@@ -1666,8 +1665,6 @@ gtk_notebook_button_press (GtkWidget      *widget,
       children = children->next;
       num++;
     }
-  if (!children && !GTK_WIDGET_HAS_FOCUS (widget))
-    gtk_widget_grab_focus (widget);
   
   return TRUE;
 }