[gtk] flow box: Make final
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] flow box: Make final
- Date: Wed, 29 May 2019 00:02:19 +0000 (UTC)
commit aec5e3d71efe39432252a1e565e3439d9d76a5ae
Author: Matthias Clasen <mclasen redhat com>
Date: Tue May 28 20:01:03 2019 -0400
flow box: Make final
We keep GtkFlowBoxChild subclassable, though.
gtk/gtkflowbox.c | 23 +++++++++++++++++++++++
gtk/gtkflowbox.h | 38 +-------------------------------------
2 files changed, 24 insertions(+), 37 deletions(-)
---
diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c
index c24658313b..afbed23910 100644
--- a/gtk/gtkflowbox.c
+++ b/gtk/gtkflowbox.c
@@ -595,6 +595,29 @@ enum {
static GParamSpec *props[LAST_PROP] = { NULL, };
+typedef struct _GtkFlowBoxClass GtkFlowBoxClass;
+
+struct _GtkFlowBox
+{
+ GtkContainer container;
+};
+
+struct _GtkFlowBoxClass
+{
+ GtkContainerClass parent_class;
+
+ void (*child_activated) (GtkFlowBox *box,
+ GtkFlowBoxChild *child);
+ void (*selected_children_changed) (GtkFlowBox *box);
+ void (*activate_cursor_child) (GtkFlowBox *box);
+ void (*toggle_cursor_child) (GtkFlowBox *box);
+ gboolean (*move_cursor) (GtkFlowBox *box,
+ GtkMovementStep step,
+ gint count);
+ void (*select_all) (GtkFlowBox *box);
+ void (*unselect_all) (GtkFlowBox *box);
+};
+
typedef struct _GtkFlowBoxPrivate GtkFlowBoxPrivate;
struct _GtkFlowBoxPrivate {
GtkOrientation orientation;
diff --git a/gtk/gtkflowbox.h b/gtk/gtkflowbox.h
index 906162165a..ad1172d0e1 100644
--- a/gtk/gtkflowbox.h
+++ b/gtk/gtkflowbox.h
@@ -36,46 +36,12 @@ G_BEGIN_DECLS
#define GTK_TYPE_FLOW_BOX (gtk_flow_box_get_type ())
#define GTK_FLOW_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FLOW_BOX,
GtkFlowBox))
-#define GTK_FLOW_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FLOW_BOX,
GtkFlowBoxClass))
#define GTK_IS_FLOW_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_FLOW_BOX))
-#define GTK_IS_FLOW_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_FLOW_BOX))
-#define GTK_FLOW_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_FLOW_BOX,
GtkFlowBoxClass))
typedef struct _GtkFlowBox GtkFlowBox;
-typedef struct _GtkFlowBoxClass GtkFlowBoxClass;
-
typedef struct _GtkFlowBoxChild GtkFlowBoxChild;
typedef struct _GtkFlowBoxChildClass GtkFlowBoxChildClass;
-struct _GtkFlowBox
-{
- GtkContainer container;
-};
-
-struct _GtkFlowBoxClass
-{
- GtkContainerClass parent_class;
-
- void (*child_activated) (GtkFlowBox *box,
- GtkFlowBoxChild *child);
- void (*selected_children_changed) (GtkFlowBox *box);
- void (*activate_cursor_child) (GtkFlowBox *box);
- void (*toggle_cursor_child) (GtkFlowBox *box);
- gboolean (*move_cursor) (GtkFlowBox *box,
- GtkMovementStep step,
- gint count);
- void (*select_all) (GtkFlowBox *box);
- void (*unselect_all) (GtkFlowBox *box);
-
- /* Padding for future expansion */
- void (*_gtk_reserved1) (void);
- void (*_gtk_reserved2) (void);
- void (*_gtk_reserved3) (void);
- void (*_gtk_reserved4) (void);
- void (*_gtk_reserved5) (void);
- void (*_gtk_reserved6) (void);
-};
-
#define GTK_TYPE_FLOW_BOX_CHILD (gtk_flow_box_child_get_type ())
#define GTK_FLOW_BOX_CHILD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FLOW_BOX_CHILD,
GtkFlowBoxChild))
#define GTK_FLOW_BOX_CHILD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_FLOW_BOX_CHILD,
GtkFlowBoxChildClass))
@@ -94,9 +60,7 @@ struct _GtkFlowBoxChildClass
void (* activate) (GtkFlowBoxChild *child);
- /* Padding for future expansion */
- void (*_gtk_reserved1) (void);
- void (*_gtk_reserved2) (void);
+ gpointer padding[8];
};
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]