diff options
| author | Benjamin Otte <otte@redhat.com> | 2018-03-10 20:02:28 +0100 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2018-04-26 17:59:42 +0200 |
| commit | ba7849960e5e3447884f92b58e899aa5db0f0565 (patch) | |
| tree | b94462d5dbb4f5696ccf5e6115237af442c8b69d /gtk/gtkeventcontroller.c | |
| parent | c5f12a7326e46869df3b65fd5e23a1508b9ab2e1 (diff) | |
| download | gtk+-ba7849960e5e3447884f92b58e899aa5db0f0565.tar.gz | |
eventcontroller: Make widget no longer a construct-only property
The new API model is now complete. To set a widget on a controller, it
is now necessary to call gtk_widget_add_controller().
Diffstat (limited to 'gtk/gtkeventcontroller.c')
| -rw-r--r-- | gtk/gtkeventcontroller.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/gtk/gtkeventcontroller.c b/gtk/gtkeventcontroller.c index d00f09ce36..aed43c3d5e 100644 --- a/gtk/gtkeventcontroller.c +++ b/gtk/gtkeventcontroller.c @@ -87,17 +87,9 @@ gtk_event_controller_set_property (GObject *object, GParamSpec *pspec) { GtkEventController *self = GTK_EVENT_CONTROLLER (object); - GtkWidget *widget; switch (prop_id) { - case PROP_WIDGET: - widget = g_value_get_object (value); - if (widget) - { - _gtk_widget_add_controller (widget, self, FALSE); - } - break; case PROP_PROPAGATION_PHASE: gtk_event_controller_set_propagation_phase (self, g_value_get_enum (value)); @@ -130,21 +122,6 @@ gtk_event_controller_get_property (GObject *object, } static void -gtk_event_controller_dispose (GObject *object) -{ - GtkEventController *controller = GTK_EVENT_CONTROLLER (object); - GtkEventControllerPrivate *priv; - - priv = gtk_event_controller_get_instance_private (controller); - if (priv->widget) - { - gtk_widget_remove_controller (priv->widget, controller); - } - - G_OBJECT_CLASS (gtk_event_controller_parent_class)->dispose (object); -} - -static void gtk_event_controller_class_init (GtkEventControllerClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); @@ -156,7 +133,6 @@ gtk_event_controller_class_init (GtkEventControllerClass *klass) object_class->set_property = gtk_event_controller_set_property; object_class->get_property = gtk_event_controller_get_property; - object_class->dispose = gtk_event_controller_dispose; /** * GtkEventController:widget: @@ -168,7 +144,7 @@ gtk_event_controller_class_init (GtkEventControllerClass *klass) P_("Widget"), P_("Widget the gesture relates to"), GTK_TYPE_WIDGET, - GTK_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY); + GTK_PARAM_READABLE); /** * GtkEventController:propagation-phase: * |