From: Benjamin Otte <otte@redhat.com>
Date: Sat, 11 Aug 2018 15:22:10 +0000 (+0200)
Subject: widget: Port bindings to use shortcuts
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~19^2~32^2~111
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6d418134ee0146591e092c4648a6eaaf73f6d6cc;p=gtk4.git

widget: Port bindings to use shortcuts
---

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 3cf76769e4..2eb7c486d2 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -30,7 +30,6 @@
 #include "gtkaccelgroupprivate.h"
 #include "gtkaccessible.h"
 #include "gtkapplicationprivate.h"
-#include "gtkbindings.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
 #include "gtkcontainerprivate.h"
@@ -839,7 +838,6 @@ static void
 gtk_widget_class_init (GtkWidgetClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  GtkBindingSet *binding_set;
 
   g_type_class_adjust_private_offset (klass, &GtkWidget_private_offset);
   gtk_widget_parent_class = g_type_class_peek_parent (klass);
@@ -1691,11 +1689,14 @@ gtk_widget_class_init (GtkWidgetClass *klass)
                               G_TYPE_FROM_CLASS (klass),
                               _gtk_marshal_BOOLEAN__UINTv);
 
-  binding_set = gtk_binding_set_by_class (klass);
-  gtk_binding_entry_add_signal (binding_set, GDK_KEY_F10, GDK_SHIFT_MASK,
-                                "popup-menu", 0);
-  gtk_binding_entry_add_signal (binding_set, GDK_KEY_Menu, 0,
-                                "popup-menu", 0);
+  gtk_widget_class_add_binding_signal (klass,
+                                       GDK_KEY_F10, GDK_SHIFT_MASK,
+                                       "popup-menu",
+                                       NULL);
+  gtk_widget_class_add_binding_signal (klass,
+                                       GDK_KEY_Menu, 0,
+                                       "popup-menu",
+                                       NULL);
 
   gtk_widget_class_set_accessible_type (klass, GTK_TYPE_WIDGET_ACCESSIBLE);
   gtk_widget_class_set_css_name (klass, I_("widget"));