Merge branch 'drop-accel-label' into 'master'

Drop accel label

See merge request GNOME/gtk!2368

6 files changed, 0 insertions, 28 deletions

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index ffde2b41ef..d96884bb94 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -4411,7 +4411,6 @@ gtk_widget_paintable_get_type
 <TITLE>GtkWidget</TITLE>
 GtkWidget
 GtkWidgetClass
-GtkCallback
 GtkRequisition
 GtkAllocation
 gtk_widget_new
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/images/accel-label.png b/docs/reference/gtk/images/accel-label.png
deleted file mode 100644
index 282ba8c024..0000000000
--- a/docs/reference/gtk/images/accel-label.png
+++ /dev/null
diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index f1eb547a44..aa4b7f8673 100644
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -228,7 +228,6 @@ private_headers = [
 
 images = [
   'images/aboutdialog.png',
-  'images/accel-label.png',
   'images/action-bar.png',
   'images/appchooserbutton.png',
   'images/appchooserdialog.png',
diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml
index aa0bac1c29..f5e027ed0b 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
@@ -295,27 +295,6 @@ create_label (void)
 }
 
 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)
 {
   GtkWidget *widget;
@@ -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 ());