diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2017-03-31 18:58:16 +0200 |
---|---|---|
committer | Carlos Garnacho <carlosg@gnome.org> | 2017-05-25 16:25:58 +0200 |
commit | a72404dd5ab1874ac3d601cd94e0fa7184873851 (patch) | |
tree | b28cd7bb3937ad7f327e7c184ffa65b259179b8d /tests | |
parent | ef4f0e53364b51efea1d71f7770e8d52631c3cb0 (diff) | |
download | gtk+-a72404dd5ab1874ac3d601cd94e0fa7184873851.tar.gz |
gtk: Mass delete all GtkWidget event mask API
We now rely on toplevels receiving and forwarding all the events
the windowing should be able to handle. Event masks are no longer a
way to determine whether an event is deliverable ot a widget.
Events will always be delivered in the three captured/target/bubbled
phases, widgets can now just attach GtkEventControllers and let those
handle the events.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/motion-compression.c | 1 | ||||
-rw-r--r-- | tests/testgtk.c | 9 | ||||
-rw-r--r-- | tests/testinput.c | 27 | ||||
-rw-r--r-- | tests/testoverlay.c | 1 | ||||
-rw-r--r-- | tests/testpopup.c | 1 |
5 files changed, 0 insertions, 39 deletions
diff --git a/tests/motion-compression.c b/tests/motion-compression.c index a7d67f8063..1dc746954a 100644 --- a/tests/motion-compression.c +++ b/tests/motion-compression.c @@ -47,7 +47,6 @@ main (int argc, char **argv) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_default_size (GTK_WINDOW (window), 300, 300); - gtk_widget_add_events (window, GDK_POINTER_MOTION_MASK); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (window), vbox); diff --git a/tests/testgtk.c b/tests/testgtk.c index 93f8c96928..1c0097bbe2 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -4280,7 +4280,6 @@ create_cursors (GtkWidget *widget) "draw", G_CALLBACK (cursor_draw), NULL); - gtk_widget_set_events (darea, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK); g_signal_connect (darea, "button_press_event", G_CALLBACK (cursor_event), entry); gtk_widget_show (darea); @@ -6057,11 +6056,6 @@ shape_create_icon (GdkScreen *screen, gtk_container_add (GTK_CONTAINER (window), fixed); gtk_widget_show (fixed); - gtk_widget_set_events (window, - gtk_widget_get_events (window) | - GDK_BUTTON_MOTION_MASK | - GDK_BUTTON_PRESS_MASK); - gtk_widget_realize (window); pixbuf = gdk_pixbuf_new_from_file (xpm_file, NULL); @@ -7836,8 +7830,6 @@ create_scroll_test (GtkWidget *widget) gtk_box_pack_start (GTK_BOX (hbox), drawing_area); gtk_widget_show (drawing_area); - gtk_widget_set_events (drawing_area, GDK_EXPOSURE_MASK | GDK_SCROLL_MASK); - adjustment = gtk_adjustment_new (0.0, 0.0, 1000.0, 1.0, 180.0, 200.0); scroll_test_pos = 0.0; @@ -8123,7 +8115,6 @@ void create_layout (GtkWidget *widget) gtk_scrollable_set_hadjustment (GTK_SCROLLABLE (layout), hadjustment); gtk_scrollable_set_vadjustment (GTK_SCROLLABLE (layout), vadjustment); - gtk_widget_set_events (layout_widget, GDK_EXPOSURE_MASK); g_signal_connect (layout, "draw", G_CALLBACK (layout_draw_handler), NULL); diff --git a/tests/testinput.c b/tests/testinput.c index a7ccd8b49d..ef3503e5d0 100644 --- a/tests/testinput.c +++ b/tests/testinput.c @@ -229,19 +229,14 @@ quit (void) int main (int argc, char *argv[]) { - GList *devices, *d; - GdkEventMask event_mask; GtkWidget *window; GtkWidget *drawing_area; GtkWidget *vbox; GtkWidget *button; GdkWindow *gdk_win; - GdkSeat *seat; gtk_init (); - seat = gdk_display_get_default_seat (gdk_display_get_default ()); - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_widget_set_name (window, "Test Input"); @@ -282,28 +277,6 @@ main (int argc, char *argv[]) g_signal_connect (drawing_area, "proximity_out_event", G_CALLBACK (proximity_out_event), NULL); - event_mask = GDK_EXPOSURE_MASK | - GDK_LEAVE_NOTIFY_MASK | - GDK_BUTTON_PRESS_MASK | - GDK_KEY_PRESS_MASK | - GDK_POINTER_MOTION_MASK | - GDK_PROXIMITY_OUT_MASK; - - gtk_widget_set_events (drawing_area, event_mask); - - devices = gdk_seat_get_slaves (seat, GDK_SEAT_CAPABILITY_ALL_POINTING); - - for (d = devices; d; d = d->next) - { - GdkDevice *device; - - device = d->data; - gtk_widget_set_device_events (drawing_area, device, event_mask); - gdk_device_set_mode (device, GDK_MODE_SCREEN); - } - - g_list_free (devices); - gtk_widget_set_can_focus (drawing_area, TRUE); gtk_widget_grab_focus (drawing_area); diff --git a/tests/testoverlay.c b/tests/testoverlay.c index 774731cc22..583443b889 100644 --- a/tests/testoverlay.c +++ b/tests/testoverlay.c @@ -344,7 +344,6 @@ test_chase (void) gtk_window_set_title (GTK_WINDOW (win), "Chase"); overlay = gtk_overlay_new (); - gtk_widget_set_events (overlay, GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK); gtk_container_add (GTK_CONTAINER (win), overlay); sw = gtk_scrolled_window_new (NULL, NULL); diff --git a/tests/testpopup.c b/tests/testpopup.c index a78498d6f8..8037b3e31e 100644 --- a/tests/testpopup.c +++ b/tests/testpopup.c @@ -57,7 +57,6 @@ main (int argc, char *argv[]) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_widget_set_events (window, GDK_POINTER_MOTION_MASK); g_signal_connect (window, "destroy", gtk_main_quit, NULL); g_signal_connect (window, "map-event", G_CALLBACK (on_map_event), NULL); |