[gtk/wip/nielsdg/g-declare-interface: 2/2] orientable: Use G_DECLARE_INTERFACE

[Niels De Graef <nielsdg src gnome org>]

commit 776499307df42204785f84cdc9596d63a1ebccd4
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Fri Apr 3 21:50:02 2020 +0200

    orientable: Use G_DECLARE_INTERFACE

 docs/reference/gtk/gtk4-sections.txt |  2 +-
 gtk/gtk-autocleanups.h               |  1 -
 gtk/gtkorientable.c                  |  1 -
 gtk/gtkorientable.h                  | 18 ++++--------------
 4 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 5d767f608b..ae58c0160c 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -5136,7 +5136,7 @@ gtk_orientable_get_orientation
 gtk_orientable_set_orientation
 
 <SUBSECTION Standard>
-GtkOrientableIface
+GtkOrientableInterface
 GTK_IS_ORIENTABLE
 GTK_IS_ORIENTABLE_CLASS
 GTK_ORIENTABLE
diff --git a/gtk/gtk-autocleanups.h b/gtk/gtk-autocleanups.h
index 2585306986..4f5630831c 100644
--- a/gtk/gtk-autocleanups.h
+++ b/gtk/gtk-autocleanups.h
@@ -106,7 +106,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMenuButton, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMessageDialog, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMountOperation, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkNotebook, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkOrientable, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkOverlay, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPageSetup, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkPaned, g_object_unref)
diff --git a/gtk/gtkorientable.c b/gtk/gtkorientable.c
index 4987a6c76c..7b8240512b 100644
--- a/gtk/gtkorientable.c
+++ b/gtk/gtkorientable.c
@@ -43,7 +43,6 @@
  */
 
 
-typedef GtkOrientableIface GtkOrientableInterface;
 G_DEFINE_INTERFACE (GtkOrientable, gtk_orientable, G_TYPE_OBJECT)
 
 static void
diff --git a/gtk/gtkorientable.h b/gtk/gtkorientable.h
index 4044e30dce..403acc7780 100644
--- a/gtk/gtkorientable.h
+++ b/gtk/gtkorientable.h
@@ -30,26 +30,16 @@
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_ORIENTABLE             (gtk_orientable_get_type ())
-#define GTK_ORIENTABLE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ORIENTABLE, 
GtkOrientable))
-#define GTK_ORIENTABLE_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_TYPE_ORIENTABLE, 
GtkOrientableIface))
-#define GTK_IS_ORIENTABLE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ORIENTABLE))
-#define GTK_IS_ORIENTABLE_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_TYPE_ORIENTABLE))
-#define GTK_ORIENTABLE_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GTK_TYPE_ORIENTABLE, 
GtkOrientableIface))
-
-
-typedef struct _GtkOrientable       GtkOrientable;         /* Dummy typedef */
-typedef struct _GtkOrientableIface  GtkOrientableIface;
+#define GTK_TYPE_ORIENTABLE (gtk_orientable_get_type ())
+GDK_AVAILABLE_IN_ALL
+G_DECLARE_INTERFACE (GtkOrientable, gtk_orientable, GTK, ORIENTABLE, GObject)
 
-struct _GtkOrientableIface
+struct _GtkOrientableInterface
 {
   GTypeInterface base_iface;
 };
 
 
-GDK_AVAILABLE_IN_ALL
-GType          gtk_orientable_get_type        (void) G_GNUC_CONST;
-
 GDK_AVAILABLE_IN_ALL
 void           gtk_orientable_set_orientation (GtkOrientable  *orientable,
                                                GtkOrientation  orientation);