From 6117f042a87cb155670bdb92c410f4e68d10f948 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 17 Oct 2016 20:21:42 +0200 Subject: [PATCH] menuitem: Use gdk_window_new_input() --- gtk/gtkmenuitem.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index efa30591e5..72eff6ae9c 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -1543,8 +1543,6 @@ gtk_menu_item_realize (GtkWidget *widget) GtkMenuItemPrivate *priv = menu_item->priv; GtkAllocation allocation; GdkWindow *window; - GdkWindowAttr attributes; - gint attributes_mask; gtk_widget_set_realized (widget, TRUE); @@ -1554,23 +1552,14 @@ gtk_menu_item_realize (GtkWidget *widget) gtk_widget_get_allocation (widget, &allocation); - attributes.x = allocation.x; - attributes.y = allocation.y; - attributes.width = allocation.width; - attributes.height = allocation.height; - attributes.window_type = GDK_WINDOW_CHILD; - attributes.wclass = GDK_INPUT_ONLY; - attributes.event_mask = (gtk_widget_get_events (widget) | - GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_ENTER_NOTIFY_MASK | - GDK_LEAVE_NOTIFY_MASK | - GDK_POINTER_MOTION_MASK); - - attributes_mask = GDK_WA_X | GDK_WA_Y; - - priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget), - &attributes, attributes_mask); + priv->event_window = gdk_window_new_input (gtk_widget_get_parent_window (widget), + gtk_widget_get_events (widget) + | GDK_BUTTON_PRESS_MASK + | GDK_BUTTON_RELEASE_MASK + | GDK_ENTER_NOTIFY_MASK + | GDK_LEAVE_NOTIFY_MASK + | GDK_POINTER_MOTION_MASK, + &allocation); gtk_widget_register_window (widget, priv->event_window); }