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)
This commit is contained in:
Owen Taylor 2003-06-09 20:29:16 +00:00 committed by Owen Taylor
parent 85d8c33706
commit cf56667494
6 changed files with 66 additions and 4 deletions

View File

@ -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)
Sun Jun 8 22:03:09 2003 Owen Taylor <otaylor@redhat.com> Sun Jun 8 22:03:09 2003 Owen Taylor <otaylor@redhat.com>
* tests/testdnd.c: Use application/x-rootwindow-drop for * tests/testdnd.c: Use application/x-rootwindow-drop for
@ -880,6 +890,9 @@ Mon Apr 7 19:43:15 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer): * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
Use gdk_x11_display_grab/ungrab. 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 <maclas@gmx.de> 2003-04-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextlayout.c (set_para_values): * gtk/gtktextlayout.c (set_para_values):

View File

@ -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)
Sun Jun 8 22:03:09 2003 Owen Taylor <otaylor@redhat.com> Sun Jun 8 22:03:09 2003 Owen Taylor <otaylor@redhat.com>
* tests/testdnd.c: Use application/x-rootwindow-drop for * tests/testdnd.c: Use application/x-rootwindow-drop for
@ -880,6 +890,9 @@ Mon Apr 7 19:43:15 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer): * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
Use gdk_x11_display_grab/ungrab. 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 <maclas@gmx.de> 2003-04-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextlayout.c (set_para_values): * gtk/gtktextlayout.c (set_para_values):

View File

@ -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)
Sun Jun 8 22:03:09 2003 Owen Taylor <otaylor@redhat.com> Sun Jun 8 22:03:09 2003 Owen Taylor <otaylor@redhat.com>
* tests/testdnd.c: Use application/x-rootwindow-drop for * tests/testdnd.c: Use application/x-rootwindow-drop for
@ -880,6 +890,9 @@ Mon Apr 7 19:43:15 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer): * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
Use gdk_x11_display_grab/ungrab. 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 <maclas@gmx.de> 2003-04-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextlayout.c (set_para_values): * gtk/gtktextlayout.c (set_para_values):

View File

@ -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)
Sun Jun 8 22:03:09 2003 Owen Taylor <otaylor@redhat.com> Sun Jun 8 22:03:09 2003 Owen Taylor <otaylor@redhat.com>
* tests/testdnd.c: Use application/x-rootwindow-drop for * tests/testdnd.c: Use application/x-rootwindow-drop for
@ -880,6 +890,9 @@ Mon Apr 7 19:43:15 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer): * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
Use gdk_x11_display_grab/ungrab. 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 <maclas@gmx.de> 2003-04-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextlayout.c (set_para_values): * gtk/gtktextlayout.c (set_para_values):

View File

@ -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)
Sun Jun 8 22:03:09 2003 Owen Taylor <otaylor@redhat.com> Sun Jun 8 22:03:09 2003 Owen Taylor <otaylor@redhat.com>
* tests/testdnd.c: Use application/x-rootwindow-drop for * tests/testdnd.c: Use application/x-rootwindow-drop for
@ -880,6 +890,9 @@ Mon Apr 7 19:43:15 2003 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer): * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_at_pointer):
Use gdk_x11_display_grab/ungrab. 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 <maclas@gmx.de> 2003-04-07 Matthias Clasen <maclas@gmx.de>
* gtk/gtktextlayout.c (set_para_values): * gtk/gtktextlayout.c (set_para_values):

View File

@ -1704,8 +1704,7 @@ gtk_notebook_button_press (GtkWidget *widget,
gint num; gint num;
gint x, y; gint x, y;
if (event->window != notebook->event_window || if (event->type != GDK_BUTTON_PRESS || !notebook->children ||
event->type != GDK_BUTTON_PRESS || !notebook->children ||
notebook->button) notebook->button)
return FALSE; return FALSE;
@ -1753,8 +1752,6 @@ gtk_notebook_button_press (GtkWidget *widget,
children = children->next; children = children->next;
num++; num++;
} }
if (!children && !GTK_WIDGET_HAS_FOCUS (widget))
gtk_widget_grab_focus (widget);
return TRUE; return TRUE;
} }