diff options
| author | Benjamin Otte <otte@redhat.com> | 2016-10-18 00:21:45 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2016-10-18 00:22:35 +0200 |
| commit | cd8b08f98f0d670527a3d8357c38958b4b2470eb (patch) | |
| tree | 3b4ff4791c7e98bae49804d612be221942bd2f3e | |
| parent | e5b67ff7d8d08052a13d1c6341ea8c91efa948a6 (diff) | |
| download | gtk+-cd8b08f98f0d670527a3d8357c38958b4b2470eb.tar.gz | |
switch: Use gdk_window_new_input()
| -rw-r--r-- | gtk/gtkswitch.c | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c index e136f675d0..c0735328b4 100644 --- a/gtk/gtkswitch.c +++ b/gtk/gtkswitch.c @@ -492,8 +492,6 @@ gtk_switch_realize (GtkWidget *widget) { GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv; GdkWindow *parent_window; - GdkWindowAttr attributes; - gint attributes_mask; GtkAllocation allocation; gtk_widget_set_realized (widget, TRUE); @@ -503,24 +501,15 @@ gtk_switch_realize (GtkWidget *widget) gtk_widget_get_allocation (widget, &allocation); - attributes.window_type = GDK_WINDOW_CHILD; - attributes.wclass = GDK_INPUT_ONLY; - attributes.x = allocation.x; - attributes.y = allocation.y; - attributes.width = allocation.width; - attributes.height = allocation.height; - attributes.event_mask = gtk_widget_get_events (widget); - attributes.event_mask |= (GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_BUTTON1_MOTION_MASK | - GDK_POINTER_MOTION_MASK | - GDK_ENTER_NOTIFY_MASK | - GDK_LEAVE_NOTIFY_MASK); - attributes_mask = GDK_WA_X | GDK_WA_Y; - - priv->event_window = gdk_window_new (parent_window, - &attributes, - attributes_mask); + priv->event_window = gdk_window_new_input (parent_window, + gtk_widget_get_events (widget) + | GDK_BUTTON_PRESS_MASK + | GDK_BUTTON_RELEASE_MASK + | GDK_BUTTON1_MOTION_MASK + | GDK_POINTER_MOTION_MASK + | GDK_ENTER_NOTIFY_MASK + | GDK_LEAVE_NOTIFY_MASK, + &allocation); gtk_widget_register_window (widget, priv->event_window); } |