diff --git a/ChangeLog b/ChangeLog index f29f72f577436a24c03069dbd6278d0672cd30ef..f07187b76affeeff1b4e46e655e53ff027042ddc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon Jun 9 16:18:11 2003 Owen Taylor + + * 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) + Sun Jun 8 22:03:09 2003 Owen Taylor * tests/testdnd.c: Use application/x-rootwindow-drop for @@ -879,6 +889,9 @@ Mon Apr 7 19:43:15 2003 Owen Taylor * 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. 2003-04-07 Matthias Clasen diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f29f72f577436a24c03069dbd6278d0672cd30ef..f07187b76affeeff1b4e46e655e53ff027042ddc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Mon Jun 9 16:18:11 2003 Owen Taylor + + * 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) + Sun Jun 8 22:03:09 2003 Owen Taylor * tests/testdnd.c: Use application/x-rootwindow-drop for @@ -879,6 +889,9 @@ Mon Apr 7 19:43:15 2003 Owen Taylor * 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. 2003-04-07 Matthias Clasen diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f29f72f577436a24c03069dbd6278d0672cd30ef..f07187b76affeeff1b4e46e655e53ff027042ddc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Mon Jun 9 16:18:11 2003 Owen Taylor + + * 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) + Sun Jun 8 22:03:09 2003 Owen Taylor * tests/testdnd.c: Use application/x-rootwindow-drop for @@ -879,6 +889,9 @@ Mon Apr 7 19:43:15 2003 Owen Taylor * 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. 2003-04-07 Matthias Clasen diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f29f72f577436a24c03069dbd6278d0672cd30ef..f07187b76affeeff1b4e46e655e53ff027042ddc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Mon Jun 9 16:18:11 2003 Owen Taylor + + * 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) + Sun Jun 8 22:03:09 2003 Owen Taylor * tests/testdnd.c: Use application/x-rootwindow-drop for @@ -879,6 +889,9 @@ Mon Apr 7 19:43:15 2003 Owen Taylor * 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. 2003-04-07 Matthias Clasen diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f29f72f577436a24c03069dbd6278d0672cd30ef..f07187b76affeeff1b4e46e655e53ff027042ddc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Mon Jun 9 16:18:11 2003 Owen Taylor + + * 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) + Sun Jun 8 22:03:09 2003 Owen Taylor * tests/testdnd.c: Use application/x-rootwindow-drop for @@ -879,6 +889,9 @@ Mon Apr 7 19:43:15 2003 Owen Taylor * 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. 2003-04-07 Matthias Clasen diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index b88bc4ecf1a4301881c4d942b3f5ad95e647bea3..ef27c777b7f699c8ef0f9ff29ddbb7e4c7eae575 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -1704,8 +1704,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; @@ -1753,8 +1752,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; }