[gtk/drop-accel-label: 2/2] Drop GtkAccelLabel

[Matthias Clasen <matthiasc src gnome org>]

commit 3864fdbe9811e8b30f38f40a58a281ec3fc50fb3
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Aug 4 22:23:43 2020 -0400

    Drop GtkAccelLabel
    
    We no longer use this widget anywhere.

 docs/reference/gtk/gtk4.types.in          |   1 -
 docs/reference/gtk/images/accel-label.png | Bin 3181 -> 0 bytes
 docs/reference/gtk/visual_index.xml       |   3 -
 docs/tools/widgets.c                      |  22 --
 gtk/gtk.h                                 |   1 -
 gtk/gtkaccelgroup.c                       |   1 -
 gtk/gtkaccellabel.c                       | 430 ------------------------------
 gtk/gtkaccellabel.h                       |  79 ------
 gtk/gtkaccellabelprivate.h                |  39 ---
 gtk/gtkmodelbutton.c                      |   1 -
 gtk/meson.build                           |   2 -
 tests/testgtk.c                           | 100 -------
 12 files changed, 679 deletions(-)
---
diff --git a/docs/reference/gtk/gtk4.types.in b/docs/reference/gtk/gtk4.types.in
index e9de91ee86..cede3f0619 100644
--- a/docs/reference/gtk/gtk4.types.in
+++ b/docs/reference/gtk/gtk4.types.in
@@ -2,7 +2,6 @@
 #include <gtk/gtkunixprint.h>
 
 gtk_about_dialog_get_type
-gtk_accel_label_get_type
 gtk_accessible_get_type
 gtk_actionable_get_type
 gtk_action_bar_get_type
diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml
index 8bc3a4f8e9..6810a60989 100644
--- a/docs/reference/gtk/visual_index.xml
+++ b/docs/reference/gtk/visual_index.xml
@@ -9,9 +9,6 @@
     <link linkend="GtkLabel">
       <inlinegraphic fileref="label.png" format="PNG"></inlinegraphic>
     </link>
-    <link linkend="GtkAccelLabel">
-      <inlinegraphic fileref="accel-label.png" format="PNG"></inlinegraphic>
-    </link>
     <link linkend="GtkSpinner">
       <inlinegraphic fileref="spinner.png" format="PNG"></inlinegraphic>
     </link>
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 556da8325f..70029ed276 100644
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -294,27 +294,6 @@ create_label (void)
   return new_widget_info ("label", widget, SMALL);
 }
 
-static WidgetInfo *
-create_accel_label (void)
-{
-  WidgetInfo *info;
-  GtkWidget *widget, *box;
-
-  widget = gtk_accel_label_new ("Accel Label");
-  gtk_widget_set_size_request (widget, 148, -1);
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_box_append (GTK_BOX (box), widget);
-
-  gtk_accel_label_set_accel (GTK_ACCEL_LABEL (widget), GDK_KEY_Q, GDK_CONTROL_MASK);
-
-  add_margin (box);
-
-  info = new_widget_info ("accel-label", box, SMALL);
-
-  return info;
-}
-
 static WidgetInfo *
 create_combo_box_entry (void)
 {
@@ -1534,7 +1513,6 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_stack_switcher ());
   retval = g_list_prepend (retval, create_spinner ());
   retval = g_list_prepend (retval, create_about_dialog ());
-  retval = g_list_prepend (retval, create_accel_label ());
   retval = g_list_prepend (retval, create_button ());
   retval = g_list_prepend (retval, create_check_button ());
   retval = g_list_prepend (retval, create_color_button ());
diff --git a/gtk/gtk.h b/gtk/gtk.h
index f30643b1c5..4819d51756 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -33,7 +33,6 @@
 
 #include <gtk/gtkaboutdialog.h>
 #include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkaccellabel.h>
 #include <gtk/gtkaccessible.h>
 #include <gtk/gtkactionable.h>
 #include <gtk/gtkactionbar.h>
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index f5417dbcd0..c4c2b04730 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -28,7 +28,6 @@
 
 #include "gtkaccelgroup.h"
 #include "gtkaccelgroupprivate.h"
-#include "gtkaccellabelprivate.h"
 #include "gtkintl.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index 815493a994..fad86907d2 100644
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -39,7 +39,6 @@
 #include "gtkstylecontextprivate.h"
 #include "gtkbuiltiniconprivate.h"
 #include "gtksizegroup.h"
-#include "gtkaccellabelprivate.h"
 #include "gtkactionable.h"
 #include "gtkeventcontrollermotion.h"
 #include "gtkeventcontrollerkey.h"
diff --git a/gtk/meson.build b/gtk/meson.build
index bdededeaa8..a2d9272e74 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -151,7 +151,6 @@ gtk_private_sources = files([
 gtk_public_sources = files([
   'gtkaboutdialog.c',
   'gtkaccelgroup.c',
-  'gtkaccellabel.c',
   'gtkaccessible.c',
   'gtkactionable.c',
   'gtkactionbar.c',
@@ -441,7 +440,6 @@ gtk_private_type_headers = files([
 gtk_public_headers = files([
   'gtkaboutdialog.h',
   'gtkaccelgroup.h',
-  'gtkaccellabel.h',
   'gtkaccessible.h',
   'gtkactionable.h',
   'gtkactionbar.h',
diff --git a/tests/testgtk.c b/tests/testgtk.c
index ad06542a8f..49d20714f1 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1576,105 +1576,6 @@ create_listbox (GtkWidget *widget)
     gtk_window_destroy (GTK_WINDOW (window));
 }
 
-
-static GtkWidget *
-accel_button_new (const char *text,
-                  const char *accel)
-{
-  guint keyval;
-  GdkModifierType modifiers;
-  GtkWidget *button;
-  GtkWidget *label;
-  GtkEventController *controller;
-  GtkShortcut *shortcut;
-
-  if (!gtk_accelerator_parse (accel, &keyval, &modifiers))
-    {
-      g_assert_not_reached ();
-    }
-
-  button = gtk_button_new ();
-  controller = gtk_shortcut_controller_new ();
-  gtk_shortcut_controller_set_scope (GTK_SHORTCUT_CONTROLLER (controller), GTK_SHORTCUT_SCOPE_GLOBAL);
-  gtk_event_controller_set_propagation_phase (controller, GTK_PHASE_CAPTURE);
-  shortcut = gtk_shortcut_new (gtk_keyval_trigger_new (keyval, modifiers),
-                               g_object_ref (gtk_activate_action_get ()));
-  gtk_shortcut_controller_add_shortcut (GTK_SHORTCUT_CONTROLLER (controller), shortcut);
-  gtk_widget_add_controller (button, controller);
-
-  label = gtk_accel_label_new (text);
-  gtk_accel_label_set_accel (GTK_ACCEL_LABEL (label), keyval, modifiers);
-  gtk_button_set_child (GTK_BUTTON (button), label);
-
-  return button;
-}
-
-static void
-create_key_lookup (GtkWidget *widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *box;
-      GtkWidget *button;
-      GtkWidget *content_area;
-
-      window = gtk_dialog_new_with_buttons ("Key Lookup", NULL, 0,
-                                           "_Close", GTK_RESPONSE_CLOSE,
-                                           NULL);
-
-      gtk_window_set_display (GTK_WINDOW (window),
-                             gtk_widget_get_display (widget));
-
-      /* We have to expand it so the accel labels will draw their labels
-       */
-      gtk_window_set_default_size (GTK_WINDOW (window), 300, -1);
-
-      content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_widget_set_hexpand (box, TRUE);
-      gtk_widget_set_vexpand (box, TRUE);
-      gtk_box_append (GTK_BOX (content_area), box);
-
-      button = gtk_button_new_with_mnemonic ("Button 1 (_a)");
-      gtk_box_append (GTK_BOX (box), button);
-      button = gtk_button_new_with_mnemonic ("Button 2 (_A)");
-      gtk_box_append (GTK_BOX (box), button);
-      button = gtk_button_new_with_mnemonic ("Button 3 (_\321\204)");
-      gtk_box_append (GTK_BOX (box), button);
-      button = gtk_button_new_with_mnemonic ("Button 4 (_\320\244)");
-      gtk_box_append (GTK_BOX (box), button);
-      button = gtk_button_new_with_mnemonic ("Button 6 (_b)");
-      gtk_box_append (GTK_BOX (box), button);
-      button = accel_button_new ("Button 7", "<Alt><Shift>b");
-      gtk_box_append (GTK_BOX (box), button);
-      button = accel_button_new ("Button 8", "<Alt>d");
-      gtk_box_append (GTK_BOX (box), button);
-      button = accel_button_new ("Button 9", "<Alt>Cyrillic_ve");
-      gtk_box_append (GTK_BOX (box), button);
-      button = gtk_button_new_with_mnemonic ("Button 10 (_1)");
-      gtk_box_append (GTK_BOX (box), button);
-      button = gtk_button_new_with_mnemonic ("Button 11 (_!)");
-      gtk_box_append (GTK_BOX (box), button);
-      button = accel_button_new ("Button 12", "<Super>a");
-      gtk_box_append (GTK_BOX (box), button);
-      button = accel_button_new ("Button 13", "<Hyper>a");
-      gtk_box_append (GTK_BOX (box), button);
-      button = accel_button_new ("Button 14", "<Meta>a");
-      gtk_box_append (GTK_BOX (box), button);
-
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-      g_signal_connect (window, "response", G_CALLBACK (gtk_window_destroy), NULL);
-
-      gtk_widget_show (window);
-    }
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-}
-
-
 /*
  create_modal_window
  */
@@ -5872,7 +5773,6 @@ struct {
   { "flipping", create_flipping },
   { "font selection", create_font_selection },
   { "image", create_image },
-  { "key lookup", create_key_lookup },
   { "labels", create_labels },
   { "listbox", create_listbox },
   { "message dialog", create_message_dialog },