callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkButton: avoid use of gtk_get_event_widget()

Browse Source 
We can compare the window to the window instead of the widget to the
widget.
This commit is contained in:
Ryan Lortie
2010-10-21 00:37:29 +02:00
parent 56d2590b49
commit c7e1f567b6
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtkbutton.c
View File

@ -1725,12 +1725,10 @@ gtk_button_enter_notify (GtkWidget *widget,
GdkEventCrossing *event) GdkEventCrossing *event)
{ {
GtkButton *button; GtkButton *button;
GtkWidget *event_widget;
button = GTK_BUTTON (widget); button = GTK_BUTTON (widget);
event_widget = gtk_get_event_widget ((GdkEvent*) event);
if ((event_widget == widget) && if ((event->window == button->event_window) &&
(event->detail != GDK_NOTIFY_INFERIOR)) (event->detail != GDK_NOTIFY_INFERIOR))
{ {
button->in_button = TRUE; button->in_button = TRUE;
@ -1745,14 +1743,12 @@ gtk_button_leave_notify (GtkWidget *widget,
GdkEventCrossing *event) GdkEventCrossing *event)
{ {
GtkButton *button; GtkButton *button;
GtkWidget *event_widget;
button = GTK_BUTTON (widget); button = GTK_BUTTON (widget);
event_widget = gtk_get_event_widget ((GdkEvent*) event);
if ((event_widget == widget) && if ((event->window == button->event_window) &&
(event->detail != GDK_NOTIFY_INFERIOR) && (event->detail != GDK_NOTIFY_INFERIOR) &&
(gtk_widget_get_sensitive (event_widget))) (gtk_widget_get_sensitive (widget)))
{ {
button->in_button = FALSE; button->in_button = FALSE;
gtk_button_leave (button); gtk_button_leave (button);