summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2017-05-29 12:08:19 +0200
committerCarlos Garnacho <carlosg@gnome.org>2017-09-15 21:07:18 +0200
commit7d6267e234f48df1b3a878feb159c0557a1984fc (patch)
treed32281c4987589c00af201c9b1d23965c85dc892
parentdffbe2d6a64086aa72845255043f621619f5d3da (diff)
downloadgtk+-7d6267e234f48df1b3a878feb159c0557a1984fc.tar.gz
eventcontroller: Drop event_mask API
This is unchecked, we can remove it entirely as well.
-rw-r--r--gtk/gtkeventcontroller.c28
-rw-r--r--gtk/gtkeventcontrollerprivate.h4
-rw-r--r--gtk/gtkgesture.c4
-rw-r--r--gtk/gtkgesturesingle.c19
4 files changed, 0 insertions, 55 deletions
diff --git a/gtk/gtkeventcontroller.c b/gtk/gtkeventcontroller.c
index 4a98c44d14..0d4f7a0727 100644
--- a/gtk/gtkeventcontroller.c
+++ b/gtk/gtkeventcontroller.c
@@ -234,34 +234,6 @@ gtk_event_controller_handle_event (GtkEventController *controller,
return retval;
}
-void
-gtk_event_controller_set_event_mask (GtkEventController *controller,
- GdkEventMask event_mask)
-{
- GtkEventControllerPrivate *priv;
-
- g_return_if_fail (GTK_IS_EVENT_CONTROLLER (controller));
-
- priv = gtk_event_controller_get_instance_private (controller);
-
- if (priv->evmask == event_mask)
- return;
-
- priv->evmask = event_mask;
-}
-
-GdkEventMask
-gtk_event_controller_get_event_mask (GtkEventController *controller)
-{
- GtkEventControllerPrivate *priv;
-
- g_return_val_if_fail (GTK_IS_EVENT_CONTROLLER (controller), 0);
-
- priv = gtk_event_controller_get_instance_private (controller);
-
- return priv->evmask;
-}
-
/**
* gtk_event_controller_get_widget:
* @controller: a #GtkEventController
diff --git a/gtk/gtkeventcontrollerprivate.h b/gtk/gtkeventcontrollerprivate.h
index f84719846a..40462c1804 100644
--- a/gtk/gtkeventcontrollerprivate.h
+++ b/gtk/gtkeventcontrollerprivate.h
@@ -45,8 +45,4 @@ struct _GtkEventControllerClass
gpointer padding[10];
};
-void gtk_event_controller_set_event_mask (GtkEventController *controller,
- GdkEventMask event_mask);
-GdkEventMask gtk_event_controller_get_event_mask (GtkEventController *controller);
-
#endif /* __GTK_EVENT_CONTROLLER_PRIVATE_H__ */
diff --git a/gtk/gtkgesture.c b/gtk/gtkgesture.c
index d8885ea2eb..88bbbfb7a0 100644
--- a/gtk/gtkgesture.c
+++ b/gtk/gtkgesture.c
@@ -926,10 +926,6 @@ gtk_gesture_init (GtkGesture *gesture)
priv = gtk_gesture_get_instance_private (gesture);
priv->points = g_hash_table_new_full (NULL, NULL, NULL,
(GDestroyNotify) free_point_data);
- gtk_event_controller_set_event_mask (GTK_EVENT_CONTROLLER (gesture),
- GDK_TOUCH_MASK |
- GDK_TOUCHPAD_GESTURE_MASK);
-
priv->group_link = g_list_prepend (NULL, gesture);
}
diff --git a/gtk/gtkgesturesingle.c b/gtk/gtkgesturesingle.c
index 7e3a5e895c..a7a72fb803 100644
--- a/gtk/gtkgesturesingle.c
+++ b/gtk/gtkgesturesingle.c
@@ -298,22 +298,6 @@ gtk_gesture_single_class_init (GtkGestureSingleClass *klass)
}
static void
-_gtk_gesture_single_update_evmask (GtkGestureSingle *gesture)
-{
- GtkGestureSinglePrivate *priv;
- GdkEventMask evmask;
-
- priv = gtk_gesture_single_get_instance_private (gesture);
- evmask = GDK_TOUCH_MASK;
-
- if (!priv->touch_only || gtk_simulate_touchscreen ())
- evmask |= GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
- GDK_BUTTON_MOTION_MASK;
-
- gtk_event_controller_set_event_mask (GTK_EVENT_CONTROLLER (gesture), evmask);
-}
-
-static void
gtk_gesture_single_init (GtkGestureSingle *gesture)
{
GtkGestureSinglePrivate *priv;
@@ -321,7 +305,6 @@ gtk_gesture_single_init (GtkGestureSingle *gesture)
priv = gtk_gesture_single_get_instance_private (gesture);
priv->touch_only = FALSE;
priv->button = GDK_BUTTON_PRIMARY;
- _gtk_gesture_single_update_evmask (gesture);
}
/**
@@ -372,7 +355,6 @@ gtk_gesture_single_set_touch_only (GtkGestureSingle *gesture,
return;
priv->touch_only = touch_only;
- _gtk_gesture_single_update_evmask (gesture);
g_object_notify_by_pspec (G_OBJECT (gesture), properties[PROP_TOUCH_ONLY]);
}
@@ -426,7 +408,6 @@ gtk_gesture_single_set_exclusive (GtkGestureSingle *gesture,
return;
priv->exclusive = exclusive;
- _gtk_gesture_single_update_evmask (gesture);
g_object_notify_by_pspec (G_OBJECT (gesture), properties[PROP_EXCLUSIVE]);
}