[gtk] Padding review

[Matthias Clasen <matthiasc src gnome org>]

commit 3250e703b6bd022ed63176f93cc35e5323c3464f
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun May 19 17:02:50 2019 +0000

    Padding review
    
    Ensure that the class structs of all subclassable
    types have sufficient padding (standardizing on 8
    slots, here).
    
    GtkBox
    GtkButton
    GtkDrawingArea
    GtkFixed
    GtkFrame

 gtk/gtkbox.h         | 6 +-----
 gtk/gtkbutton.h      | 6 +-----
 gtk/gtkdrawingarea.h | 8 +++-----
 gtk/gtkfixed.h       | 8 +++-----
 gtk/gtkframe.h       | 6 +-----
 5 files changed, 9 insertions(+), 25 deletions(-)
---
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index eb5146a15f..55ccb584da 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -62,11 +62,7 @@ struct _GtkBoxClass
 
   /*< private >*/
 
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
+  gpointer padding[8];
 };
 
 
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index c6a31b64ca..f3738f9166 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -70,11 +70,7 @@ struct _GtkButtonClass
 
   /*< private >*/
 
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
+  gpointer padding[8];
 };
 
 
diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h
index 56e295c148..47cd8df622 100644
--- a/gtk/gtkdrawingarea.h
+++ b/gtk/gtkdrawingarea.h
@@ -75,11 +75,9 @@ struct _GtkDrawingAreaClass
 {
   GtkWidgetClass parent_class;
 
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
+  /*< private >*/
+
+  gpointer padding[8];
 };
 
 
diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h
index 3127193439..539dfed970 100644
--- a/gtk/gtkfixed.h
+++ b/gtk/gtkfixed.h
@@ -54,11 +54,9 @@ struct _GtkFixedClass
 {
   GtkContainerClass parent_class;
 
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
+  /*< private >*/
+
+  gpointer padding[8];
 };
 
 GDK_AVAILABLE_IN_ALL
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index 761725dcca..a02a3c8323 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -67,11 +67,7 @@ struct _GtkFrameClass
 
   /*< private >*/
 
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
+  gpointer padding[8];
 };