summaryrefslogtreecommitdiff
path: root/gtk/gtkcellrendereraccel.c
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2018-04-20 19:58:06 +0200
committerCarlos Garnacho <carlosg@gnome.org>2018-04-26 17:59:42 +0200
commit15e00759c74a6bb72bffe2a6d7f75c83914c11c5 (patch)
tree793c4a97120e19a9c540aa282fd530ae3ef0c9f2 /gtk/gtkcellrendereraccel.c
parentba7849960e5e3447884f92b58e899aa5db0f0565 (diff)
downloadgtk+-15e00759c74a6bb72bffe2a6d7f75c83914c11c5.tar.gz
eventcontrollerkey: Port to new API model
Diffstat (limited to 'gtk/gtkcellrendereraccel.c')
-rw-r--r--gtk/gtkcellrendereraccel.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/gtkcellrendereraccel.c b/gtk/gtkcellrendereraccel.c
index fd55ea3d07..14a669b431 100644
--- a/gtk/gtkcellrendereraccel.c
+++ b/gtk/gtkcellrendereraccel.c
@@ -520,7 +520,6 @@ struct _GtkCellEditableWidget
GtkCellRendererAccelMode accel_mode;
gchar *path;
GtkCellRenderer *cell;
- GtkEventController *key_controller;
};
enum {
@@ -718,7 +717,6 @@ gtk_cell_editable_widget_finalize (GObject *object)
{
GtkCellEditableWidget *box = (GtkCellEditableWidget*)object;
- g_object_unref (box->key_controller);
g_free (box->path);
G_OBJECT_CLASS (gtk_cell_editable_widget_parent_class)->finalize (object);
@@ -757,14 +755,16 @@ static void
gtk_cell_editable_widget_init (GtkCellEditableWidget *box)
{
GtkWidget *widget = GTK_WIDGET (box);
+ GtkEventController *controller;
gtk_widget_set_can_focus (widget, TRUE);
- box->key_controller = gtk_event_controller_key_new (widget);
- g_signal_connect (box->key_controller, "key-pressed",
+ controller = gtk_event_controller_key_new ();
+ g_signal_connect (controller, "key-pressed",
G_CALLBACK (key_controller_key_pressed), box);
- g_signal_connect (box->key_controller, "modifiers",
+ g_signal_connect (controller, "modifiers",
G_CALLBACK (key_controller_modifiers), box);
+ gtk_widget_add_controller (widget, controller);
gtk_widget_set_has_surface (widget, FALSE);
}