diff --git a/gtk/a11y/Makefile.inc b/gtk/a11y/Makefile.inc
index 8529c7ae57..90b802e35c 100644
--- a/gtk/a11y/Makefile.inc
+++ b/gtk/a11y/Makefile.inc
@@ -1,6 +1,5 @@
a11y_h_sources = \
a11y/gtk-a11y-autocleanups.h \
- a11y/gtkarrowaccessible.h \
a11y/gtkbooleancellaccessible.h \
a11y/gtkbuttonaccessible.h \
a11y/gtkcellaccessible.h \
@@ -73,7 +72,6 @@ a11y_c_sources = \
a11y/gtkaccessibility.c \
a11y/gtkaccessibilitymisc.c \
a11y/gtkaccessibilityutil.c \
- a11y/gtkarrowaccessible.c \
a11y/gtkbooleancellaccessible.c \
a11y/gtkbuttonaccessible.c \
a11y/gtkcellaccessible.c \
diff --git a/gtk/a11y/gtk-a11y-autocleanups.h b/gtk/a11y/gtk-a11y-autocleanups.h
index 8722a437c6..2dde2f1cef 100644
--- a/gtk/a11y/gtk-a11y-autocleanups.h
+++ b/gtk/a11y/gtk-a11y-autocleanups.h
@@ -21,7 +21,6 @@
#ifndef __GI_SCANNER__
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkArrowAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkBooleanCellAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkButtonAccessible, g_object_unref)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkCellAccessible, g_object_unref)
diff --git a/gtk/a11y/gtkarrowaccessible.c b/gtk/a11y/gtkarrowaccessible.c
deleted file mode 100644
index fb1fdfc819..0000000000
--- a/gtk/a11y/gtkarrowaccessible.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* GTK+ - accessibility implementations
- * Copyright 2001 Sun Microsystems Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see .
- */
-
-#include "config.h"
-
-#include
-#include "gtkarrowaccessible.h"
-
-struct _GtkArrowAccessiblePrivate
-{
- gchar *image_description;
-};
-
-static void atk_image_interface_init (AtkImageIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (GtkArrowAccessible, gtk_arrow_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
- G_ADD_PRIVATE (GtkArrowAccessible)
- G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init))
-
-static void
-gtk_arrow_accessible_initialize (AtkObject *accessible,
- gpointer data)
-{
- ATK_OBJECT_CLASS (gtk_arrow_accessible_parent_class)->initialize (accessible, data);
-
- accessible->role = ATK_ROLE_ICON;
-}
-
-static void
-gtk_arrow_accessible_finalize (GObject *object)
-{
- GtkArrowAccessible *arrow = GTK_ARROW_ACCESSIBLE (object);
-
- g_free (arrow->priv->image_description);
-
- G_OBJECT_CLASS (gtk_arrow_accessible_parent_class)->finalize (object);
-}
-
-static void
-gtk_arrow_accessible_class_init (GtkArrowAccessibleClass *klass)
-{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
-
- atk_object_class->initialize = gtk_arrow_accessible_initialize;
-
- gobject_class->finalize = gtk_arrow_accessible_finalize;
-}
-
-static void
-gtk_arrow_accessible_init (GtkArrowAccessible *arrow)
-{
- arrow->priv = gtk_arrow_accessible_get_instance_private (arrow);
-}
-
-static const gchar *
-gtk_arrow_accessible_get_image_description (AtkImage *obj)
-{
- GtkArrowAccessible *arrow = GTK_ARROW_ACCESSIBLE (obj);
-
- return arrow->priv->image_description;
-}
-
-static gboolean
-gtk_arrow_accessible_set_image_description (AtkImage *obj,
- const gchar *description)
-{
- GtkArrowAccessible *arrow = GTK_ARROW_ACCESSIBLE (obj);
-
- g_free (arrow->priv->image_description);
- arrow->priv->image_description = g_strdup (description);
-
- return TRUE;
-
-}
-
-static void
-atk_image_interface_init (AtkImageIface *iface)
-{
- iface->get_image_description = gtk_arrow_accessible_get_image_description;
- iface->set_image_description = gtk_arrow_accessible_set_image_description;
-}
diff --git a/gtk/a11y/gtkarrowaccessible.h b/gtk/a11y/gtkarrowaccessible.h
deleted file mode 100644
index 69b67a7a4b..0000000000
--- a/gtk/a11y/gtkarrowaccessible.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* GTK+ - accessibility implementations
- * Copyright 2001 Sun Microsystems Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see .
- */
-
-#ifndef __GTK_ARROW_ACCESSIBLE_H__
-#define __GTK_ARROW_ACCESSIBLE_H__
-
-#if !defined (__GTK_A11Y_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only can be included directly."
-#endif
-
-#include
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_ARROW_ACCESSIBLE (gtk_arrow_accessible_get_type ())
-#define GTK_ARROW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ARROW_ACCESSIBLE, GtkArrowAccessible))
-#define GTK_ARROW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ARROW_ACCESSIBLE, GtkArrowAccessibleClass))
-#define GTK_IS_ARROW_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ARROW_ACCESSIBLE))
-#define GTK_IS_ARROW_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ARROW_ACCESSIBLE))
-#define GTK_ARROW_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ARROW_ACCESSIBLE, GtkArrowAccessibleClass))
-
-typedef struct _GtkArrowAccessible GtkArrowAccessible;
-typedef struct _GtkArrowAccessibleClass GtkArrowAccessibleClass;
-typedef struct _GtkArrowAccessiblePrivate GtkArrowAccessiblePrivate;
-
-struct _GtkArrowAccessible
-{
- GtkWidgetAccessible parent;
-
- GtkArrowAccessiblePrivate *priv;
-};
-
-struct _GtkArrowAccessibleClass
-{
- GtkWidgetAccessibleClass parent_class;
-};
-
-GDK_AVAILABLE_IN_ALL
-GType gtk_arrow_accessible_get_type (void);
-
-G_END_DECLS
-
-#endif /* __GTK_ARROW_ACCESSIBLE_H__ */
diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc
index 0cf9b94940..9c1470b128 100644
--- a/gtk/deprecated/Makefile.inc
+++ b/gtk/deprecated/Makefile.inc
@@ -3,7 +3,6 @@ deprecated_h_sources = \
deprecated/gtkaction.h \
deprecated/gtkactiongroup.h \
deprecated/gtkalignment.h \
- deprecated/gtkarrow.h \
deprecated/gtkcolorsel.h \
deprecated/gtkcolorseldialog.h \
deprecated/gtkfontsel.h \
@@ -44,7 +43,6 @@ deprecated_c_sources = \
deprecated/gtkaction.c \
deprecated/gtkactiongroup.c \
deprecated/gtkalignment.c \
- deprecated/gtkarrow.c \
deprecated/gtkcolorsel.c \
deprecated/gtkcolorseldialog.c \
deprecated/gtkfontsel.c \
diff --git a/gtk/deprecated/gtkarrow.c b/gtk/deprecated/gtkarrow.c
deleted file mode 100644
index 3312ffc2e9..0000000000
--- a/gtk/deprecated/gtkarrow.c
+++ /dev/null
@@ -1,377 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see .
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2001. See the AUTHORS
- * file for a list of people on the GTK+ Team. See the ChangeLog
- * files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-/**
- * SECTION:gtkarrow
- * @Short_description: Displays an arrow
- * @Title: GtkArrow
- * @See_also: gtk_render_arrow()
- *
- * GtkArrow should be used to draw simple arrows that need to point in
- * one of the four cardinal directions (up, down, left, or right). The
- * style of the arrow can be one of shadow in, shadow out, etched in, or
- * etched out. Note that these directions and style types may be
- * amended in versions of GTK+ to come.
- *
- * GtkArrow will fill any space alloted to it, but since it is inherited
- * from #GtkMisc, it can be padded and/or aligned, to fill exactly the
- * space the programmer desires.
- *
- * Arrows are created with a call to gtk_arrow_new(). The direction or
- * style of an arrow can be changed after creation by using gtk_arrow_set().
- *
- * GtkArrow has been deprecated; you can simply use a #GtkImage with a
- * suitable icon name, such as “pan-down-symbolic“. When replacing
- * GtkArrow by an image, pay attention to the fact that GtkArrow is
- * doing automatic flipping between #GTK_ARROW_LEFT and #GTK_ARROW_RIGHT,
- * depending on the text direction. To get the same effect with an image,
- * use the icon names “pan-start-symbolic“ and “pan-end-symbolic“, which
- * react to the text direction.
- */
-
-#include "config.h"
-#include
-#include "gtkarrow.h"
-#include "gtksizerequest.h"
-#include "gtktypebuiltins.h"
-#include "gtkprivate.h"
-#include "gtkintl.h"
-
-#include "a11y/gtkarrowaccessible.h"
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
-#define MIN_ARROW_SIZE 15
-
-struct _GtkArrowPrivate
-{
- gint16 arrow_type;
- gint16 shadow_type;
-};
-
-enum {
- PROP_0,
- PROP_ARROW_TYPE,
- PROP_SHADOW_TYPE
-};
-
-
-static void gtk_arrow_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void gtk_arrow_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static gboolean gtk_arrow_draw (GtkWidget *widget,
- cairo_t *cr);
-
-static void gtk_arrow_get_preferred_width (GtkWidget *widget,
- gint *minimum_size,
- gint *natural_size);
-static void gtk_arrow_get_preferred_height (GtkWidget *widget,
- gint *minimum_size,
- gint *natural_size);
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-G_DEFINE_TYPE_WITH_PRIVATE (GtkArrow, gtk_arrow, GTK_TYPE_MISC)
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-static void
-gtk_arrow_class_init (GtkArrowClass *class)
-{
- GObjectClass *gobject_class;
- GtkWidgetClass *widget_class;
-
- gobject_class = (GObjectClass*) class;
- widget_class = (GtkWidgetClass*) class;
-
- gobject_class->set_property = gtk_arrow_set_property;
- gobject_class->get_property = gtk_arrow_get_property;
-
- widget_class->draw = gtk_arrow_draw;
- widget_class->get_preferred_width = gtk_arrow_get_preferred_width;
- widget_class->get_preferred_height = gtk_arrow_get_preferred_height;
-
- g_object_class_install_property (gobject_class,
- PROP_ARROW_TYPE,
- g_param_spec_enum ("arrow-type",
- P_("Arrow direction"),
- P_("The direction the arrow should point"),
- GTK_TYPE_ARROW_TYPE,
- GTK_ARROW_RIGHT,
- GTK_PARAM_READWRITE));
-
- g_object_class_install_property (gobject_class,
- PROP_SHADOW_TYPE,
- g_param_spec_enum ("shadow-type",
- P_("Arrow shadow"),
- P_("Appearance of the shadow surrounding the arrow"),
- GTK_TYPE_SHADOW_TYPE,
- GTK_SHADOW_OUT,
- GTK_PARAM_READWRITE));
-
- gtk_widget_class_install_style_property (widget_class,
- g_param_spec_float ("arrow-scaling",
- P_("Arrow Scaling"),
- P_("Amount of space used up by arrow"),
- 0.0, 1.0, 0.7,
- GTK_PARAM_READABLE));
-
- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ARROW_ACCESSIBLE);
-}
-
-static void
-gtk_arrow_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- GtkArrow *arrow = GTK_ARROW (object);
- GtkArrowPrivate *priv = arrow->priv;
-
- switch (prop_id)
- {
- case PROP_ARROW_TYPE:
- gtk_arrow_set (arrow,
- g_value_get_enum (value),
- priv->shadow_type);
- break;
- case PROP_SHADOW_TYPE:
- gtk_arrow_set (arrow,
- priv->arrow_type,
- g_value_get_enum (value));
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gtk_arrow_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- GtkArrow *arrow = GTK_ARROW (object);
- GtkArrowPrivate *priv = arrow->priv;
-
- switch (prop_id)
- {
- case PROP_ARROW_TYPE:
- g_value_set_enum (value, priv->arrow_type);
- break;
- case PROP_SHADOW_TYPE:
- g_value_set_enum (value, priv->shadow_type);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-gtk_arrow_init (GtkArrow *arrow)
-{
- arrow->priv = gtk_arrow_get_instance_private (arrow);
-
- gtk_widget_set_has_window (GTK_WIDGET (arrow), FALSE);
-
- arrow->priv->arrow_type = GTK_ARROW_RIGHT;
- arrow->priv->shadow_type = GTK_SHADOW_OUT;
-}
-
-static void
-gtk_arrow_get_preferred_width (GtkWidget *widget,
- gint *minimum_size,
- gint *natural_size)
-{
- GtkBorder border;
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- _gtk_misc_get_padding_and_border (GTK_MISC (widget), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
-
- *minimum_size = MIN_ARROW_SIZE + border.left + border.right;
- *natural_size = MIN_ARROW_SIZE + border.left + border.right;
-}
-
-static void
-gtk_arrow_get_preferred_height (GtkWidget *widget,
- gint *minimum_size,
- gint *natural_size)
-{
- GtkBorder border;
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- _gtk_misc_get_padding_and_border (GTK_MISC (widget), &border);
-G_GNUC_END_IGNORE_DEPRECATIONS
-
- *minimum_size = MIN_ARROW_SIZE + border.top + border.bottom;
- *natural_size = MIN_ARROW_SIZE + border.top + border.bottom;
-}
-
-/**
- * gtk_arrow_new:
- * @arrow_type: a valid #GtkArrowType.
- * @shadow_type: a valid #GtkShadowType.
- *
- * Creates a new #GtkArrow widget.
- *
- * Returns: the new #GtkArrow widget.
- *
- * Deprecated: 3.14: Use a #GtkImage with a suitable icon.
- */
-GtkWidget*
-gtk_arrow_new (GtkArrowType arrow_type,
- GtkShadowType shadow_type)
-{
- GtkArrowPrivate *priv;
- GtkArrow *arrow;
-
- arrow = g_object_new (GTK_TYPE_ARROW, NULL);
-
- priv = arrow->priv;
-
- priv->arrow_type = arrow_type;
- priv->shadow_type = shadow_type;
-
- return GTK_WIDGET (arrow);
-}
-
-/**
- * gtk_arrow_set:
- * @arrow: a widget of type #GtkArrow.
- * @arrow_type: a valid #GtkArrowType.
- * @shadow_type: a valid #GtkShadowType.
- *
- * Sets the direction and style of the #GtkArrow, @arrow.
- *
- * Deprecated: 3.14: Use a #GtkImage with a suitable icon.
- */
-void
-gtk_arrow_set (GtkArrow *arrow,
- GtkArrowType arrow_type,
- GtkShadowType shadow_type)
-{
- GtkArrowPrivate *priv;
- GtkWidget *widget;
-
- g_return_if_fail (GTK_IS_ARROW (arrow));
-
- priv = arrow->priv;
-
- if (priv->arrow_type != arrow_type
- || priv->shadow_type != shadow_type)
- {
- g_object_freeze_notify (G_OBJECT (arrow));
-
- if ((GtkArrowType) priv->arrow_type != arrow_type)
- {
- priv->arrow_type = arrow_type;
- g_object_notify (G_OBJECT (arrow), "arrow-type");
- }
-
- if (priv->shadow_type != shadow_type)
- {
- priv->shadow_type = shadow_type;
- g_object_notify (G_OBJECT (arrow), "shadow-type");
- }
-
- g_object_thaw_notify (G_OBJECT (arrow));
-
- widget = GTK_WIDGET (arrow);
- if (gtk_widget_is_drawable (widget))
- gtk_widget_queue_draw (widget);
- }
-}
-
-static gboolean
-gtk_arrow_draw (GtkWidget *widget,
- cairo_t *cr)
-{
- GtkArrow *arrow = GTK_ARROW (widget);
- GtkArrowPrivate *priv = arrow->priv;
- GtkStyleContext *context;
- gdouble x, y;
- gint width, height;
- gint extent;
- GtkBorder border;
- gfloat xalign, yalign;
- GtkArrowType effective_arrow_type;
- gfloat arrow_scaling;
- gdouble angle;
-
- if (priv->arrow_type == GTK_ARROW_NONE)
- return FALSE;
-
- context = gtk_widget_get_style_context (widget);
- gtk_widget_style_get (widget, "arrow-scaling", &arrow_scaling, NULL);
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- _gtk_misc_get_padding_and_border (GTK_MISC (widget), &border);
- gtk_misc_get_alignment (GTK_MISC (widget), &xalign, &yalign);
-G_GNUC_END_IGNORE_DEPRECATIONS
-
- width = gtk_widget_get_allocated_width (widget) - border.left - border.right;
- height = gtk_widget_get_allocated_height (widget) - border.top - border.bottom;
-
- extent = MIN (width, height) * arrow_scaling;
- effective_arrow_type = priv->arrow_type;
-
- if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
- {
- xalign = 1.0 - xalign;
- if (priv->arrow_type == GTK_ARROW_LEFT)
- effective_arrow_type = GTK_ARROW_RIGHT;
- else if (priv->arrow_type == GTK_ARROW_RIGHT)
- effective_arrow_type = GTK_ARROW_LEFT;
- }
-
- x = border.left + ((width - extent) * xalign);
- y = border.top + ((height - extent) * yalign);
-
- switch (effective_arrow_type)
- {
- case GTK_ARROW_UP:
- angle = 0;
- break;
- case GTK_ARROW_RIGHT:
- angle = G_PI / 2;
- break;
- case GTK_ARROW_DOWN:
- angle = G_PI;
- break;
- case GTK_ARROW_LEFT:
- default:
- angle = (3 * G_PI) / 2;
- break;
- }
-
- gtk_render_arrow (context, cr, angle, x, y, extent);
-
- return FALSE;
-}
diff --git a/gtk/deprecated/gtkarrow.h b/gtk/deprecated/gtkarrow.h
deleted file mode 100644
index faf67bc399..0000000000
--- a/gtk/deprecated/gtkarrow.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see .
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2001. See the AUTHORS
- * file for a list of people on the GTK+ Team. See the ChangeLog
- * files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_ARROW_H__
-#define __GTK_ARROW_H__
-
-
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only can be included directly."
-#endif
-
-#include
-
-
-G_BEGIN_DECLS
-
-
-#define GTK_TYPE_ARROW (gtk_arrow_get_type ())
-#define GTK_ARROW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ARROW, GtkArrow))
-#define GTK_ARROW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ARROW, GtkArrowClass))
-#define GTK_IS_ARROW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ARROW))
-#define GTK_IS_ARROW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ARROW))
-#define GTK_ARROW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ARROW, GtkArrowClass))
-
-typedef struct _GtkArrow GtkArrow;
-typedef struct _GtkArrowPrivate GtkArrowPrivate;
-typedef struct _GtkArrowClass GtkArrowClass;
-
-struct _GtkArrow
-{
- GtkMisc misc;
-
- /*< private >*/
- GtkArrowPrivate *priv;
-};
-
-struct _GtkArrowClass
-{
- GtkMiscClass parent_class;
-
- /* Padding for future expansion */
- void (*_gtk_reserved1) (void);
- void (*_gtk_reserved2) (void);
- void (*_gtk_reserved3) (void);
- void (*_gtk_reserved4) (void);
-};
-
-
-GDK_DEPRECATED_IN_3_14
-GType gtk_arrow_get_type (void) G_GNUC_CONST;
-GDK_DEPRECATED_IN_3_14
-GtkWidget* gtk_arrow_new (GtkArrowType arrow_type,
- GtkShadowType shadow_type);
-GDK_DEPRECATED_IN_3_14
-void gtk_arrow_set (GtkArrow *arrow,
- GtkArrowType arrow_type,
- GtkShadowType shadow_type);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_ARROW_H__ */
diff --git a/gtk/gtk-a11y.h b/gtk/gtk-a11y.h
index 450acd4dab..c6a06f0f26 100644
--- a/gtk/gtk-a11y.h
+++ b/gtk/gtk-a11y.h
@@ -28,7 +28,6 @@
#define __GTK_A11Y_H_INSIDE__
#include
-#include
#include
#include
#include
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 7784446885..b23785256f 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -244,7 +244,6 @@
#include
#ifndef GTK_DISABLE_DEPRECATED
-#include
#include
#include
#include
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 9ced4c963f..364ef3d214 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -715,7 +715,6 @@ test_types (void)
"