From dcfa2fa4bd919293ce993ec83917e3e43cb4f7f9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 27 May 2019 01:32:24 +0000 Subject: [PATCH] aspect frame: Make final --- gtk/gtkaspectframe.c | 11 +++++++++++ gtk/gtkaspectframe.h | 29 +---------------------------- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c index f07f03ca24..1f56f242f1 100644 --- a/gtk/gtkaspectframe.c +++ b/gtk/gtkaspectframe.c @@ -55,6 +55,17 @@ #include "gtkintl.h" +typedef struct _GtkAspectFrameClass GtkAspectFrameClass; + +struct _GtkAspectFrame +{ + GtkFrame parent_instance; +}; + +struct _GtkAspectFrameClass +{ + GtkFrameClass parent_class; +}; typedef struct { diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h index 6fd4be6535..10e028bc56 100644 --- a/gtk/gtkaspectframe.h +++ b/gtk/gtkaspectframe.h @@ -37,36 +37,9 @@ G_BEGIN_DECLS #define GTK_TYPE_ASPECT_FRAME (gtk_aspect_frame_get_type ()) #define GTK_ASPECT_FRAME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrame)) -#define GTK_ASPECT_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass)) #define GTK_IS_ASPECT_FRAME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ASPECT_FRAME)) -#define GTK_IS_ASPECT_FRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ASPECT_FRAME)) -#define GTK_ASPECT_FRAME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrameClass)) - -typedef struct _GtkAspectFrame GtkAspectFrame; -typedef struct _GtkAspectFrameClass GtkAspectFrameClass; - -struct _GtkAspectFrame -{ - GtkFrame parent_instance; -}; - -/** - * GtkAspectFrameClass: - * @parent_class: The parent class. - */ -struct _GtkAspectFrameClass -{ - GtkFrameClass parent_class; - - /*< private >*/ - - /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); -}; +typedef struct _GtkAspectFrame GtkAspectFrame; GDK_AVAILABLE_IN_ALL GType gtk_aspect_frame_get_type (void) G_GNUC_CONST;