]> Pileus Git - ~andy/gtk/commitdiff
GtkButton: avoid use of gtk_get_event_widget()
authorRyan Lortie <desrt@desrt.ca>
Wed, 20 Oct 2010 22:37:29 +0000 (00:37 +0200)
committerRyan Lortie <desrt@desrt.ca>
Wed, 20 Oct 2010 22:37:29 +0000 (00:37 +0200)
We can compare the window to the window instead of the widget to the
widget.

gtk/gtkbutton.c

index 940b2cc93fef05bca1acaac1690e05778a79d4e9..2b766e331aec7f9da936d66953b7aa70b1bb25df 100644 (file)
@@ -1725,12 +1725,10 @@ gtk_button_enter_notify (GtkWidget        *widget,
                         GdkEventCrossing *event)
 {
   GtkButton *button;
-  GtkWidget *event_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))
     {
       button->in_button = TRUE;
@@ -1745,14 +1743,12 @@ gtk_button_leave_notify (GtkWidget        *widget,
                         GdkEventCrossing *event)
 {
   GtkButton *button;
-  GtkWidget *event_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) &&
-      (gtk_widget_get_sensitive (event_widget)))
+      (gtk_widget_get_sensitive (widget)))
     {
       button->in_button = FALSE;
       gtk_button_leave (button);