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



commit 5a3c49c8282023aea4eed66d64602d5d0f6fad24
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Fri Apr 3 21:48:58 2020 +0200

    actionable: Use G_DECLARE_INTERFACE

 gtk/gtk-autocleanups.h |  1 -
 gtk/gtkactionable.h    | 18 ++++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/gtk/gtk-autocleanups.h b/gtk/gtk-autocleanups.h
index bf5f0f6a61..2585306986 100644
--- a/gtk/gtk-autocleanups.h
+++ b/gtk/gtk-autocleanups.h
@@ -23,7 +23,6 @@
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAccessible, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkActionBar, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkActionable, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAdjustment, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAppChooser, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAppChooserButton, g_object_unref)
diff --git a/gtk/gtkactionable.h b/gtk/gtkactionable.h
index af42e5e1d4..58f112b4e2 100644
--- a/gtk/gtkactionable.h
+++ b/gtk/gtkactionable.h
@@ -21,20 +21,13 @@
 #define __GTK_ACTIONABLE_H__
 
 #include <glib-object.h>
-#include <gdk/gdk.h>
+#include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_ACTIONABLE                                 (gtk_actionable_get_type ())
-#define GTK_ACTIONABLE(inst)                                (G_TYPE_CHECK_INSTANCE_CAST ((inst),             
        \
-                                                             GTK_TYPE_ACTIONABLE, GtkActionable))
-#define GTK_IS_ACTIONABLE(inst)                             (G_TYPE_CHECK_INSTANCE_TYPE ((inst),             
        \
-                                                             GTK_TYPE_ACTIONABLE))
-#define GTK_ACTIONABLE_GET_IFACE(inst)                      (G_TYPE_INSTANCE_GET_INTERFACE ((inst),          
        \
-                                                             GTK_TYPE_ACTIONABLE, GtkActionableInterface))
-
-typedef struct _GtkActionableInterface                      GtkActionableInterface;
-typedef struct _GtkActionable                               GtkActionable;
+#define GTK_TYPE_ACTIONABLE (gtk_actionable_get_type ())
+GDK_AVAILABLE_IN_ALL
+G_DECLARE_INTERFACE (GtkActionable, gtk_actionable, GTK, ACTIONABLE, GtkWidget)
 
 struct _GtkActionableInterface
 {
@@ -51,9 +44,6 @@ struct _GtkActionableInterface
                                                  GVariant      *target_value);
 };
 
-GDK_AVAILABLE_IN_ALL
-GType                   gtk_actionable_get_type                         (void) G_GNUC_CONST;
-
 GDK_AVAILABLE_IN_ALL
 const gchar *           gtk_actionable_get_action_name                  (GtkActionable *actionable);
 GDK_AVAILABLE_IN_ALL


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]