[gtk] link button: Don't allow subclassing



commit c8a901c1dcf32b0119651332b127909ed209e248
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun May 19 21:05:40 2019 +0000

    link button: Don't allow subclassing

 gtk/gtklinkbutton.c | 18 ++++++++++++++++++
 gtk/gtklinkbutton.h | 42 +-----------------------------------------
 2 files changed, 19 insertions(+), 41 deletions(-)
---
diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
index 50f4dfb6da..f9802d077a 100644
--- a/gtk/gtklinkbutton.c
+++ b/gtk/gtklinkbutton.c
@@ -73,6 +73,24 @@
 
 #include <string.h>
 
+typedef struct _GtkLinkButtonClass GtkLinkButtonClass;
+typedef struct _GtkLinkButtonPrivate GtkLinkButtonPrivate;
+
+struct _GtkLinkButton
+{
+  /*< private >*/
+  GtkButton parent_instance;
+};
+
+struct _GtkLinkButtonClass
+{
+  /*< private >*/
+  GtkButtonClass parent_class;
+
+  /*< public >*/
+  gboolean (* activate_link) (GtkLinkButton *button);
+};
+
 struct _GtkLinkButtonPrivate
 {
   gchar *uri;
diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h
index de3b3997cb..bf85e15f5b 100644
--- a/gtk/gtklinkbutton.h
+++ b/gtk/gtklinkbutton.h
@@ -35,48 +35,8 @@ G_BEGIN_DECLS
 #define GTK_TYPE_LINK_BUTTON           (gtk_link_button_get_type ())
 #define GTK_LINK_BUTTON(obj)           (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_LINK_BUTTON, 
GtkLinkButton))
 #define GTK_IS_LINK_BUTTON(obj)                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_LINK_BUTTON))
-#define GTK_LINK_BUTTON_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_LINK_BUTTON, 
GtkLinkButtonClass))
-#define GTK_IS_LINK_BUTTON_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_LINK_BUTTON))
-#define GTK_LINK_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_LINK_BUTTON, 
GtkLinkButtonClass))
 
-typedef struct _GtkLinkButton          GtkLinkButton;
-typedef struct _GtkLinkButtonClass     GtkLinkButtonClass;
-typedef struct _GtkLinkButtonPrivate   GtkLinkButtonPrivate;
-
-/**
- * GtkLinkButton:
- *
- * The #GtkLinkButton-struct contains only
- * private data and should be accessed using the provided API.
- */
-struct _GtkLinkButton
-{
-  /*< private >*/
-  GtkButton parent_instance;
-};
-
-/**
- * GtkLinkButtonClass:
- * @activate_link: class handler for the #GtkLinkButton::activate-link signal
- *
- * The #GtkLinkButtonClass contains only
- * private data.
- */
-struct _GtkLinkButtonClass
-{
-  /*< private >*/
-  GtkButtonClass parent_class;
-
-  /*< public >*/
-  gboolean (* activate_link) (GtkLinkButton *button);
-
-  /*< private >*/
-  /* Padding for future expansion */
-  void (*_gtk_padding1) (void);
-  void (*_gtk_padding2) (void);
-  void (*_gtk_padding3) (void);
-  void (*_gtk_padding4) (void);
-};
+typedef struct _GtkLinkButton GtkLinkButton;
 
 GDK_AVAILABLE_IN_ALL
 GType                 gtk_link_button_get_type          (void) G_GNUC_CONST;


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