From: Michael Natterer Date: Tue, 25 Jan 2011 21:29:00 +0000 (+0100) Subject: gtk: add missing class padding X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=3933f99ed7f024a3ddbb2bd854065f5a196b6733;p=~andy%2Fgtk gtk: add missing class padding Sorry for this late ABI break, but the newly added style classes definitely need padding, so I can just as well add missing padding globally. --- diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h index cc4d96da6..48a8fccd6 100644 --- a/gtk/gtkalignment.h +++ b/gtk/gtkalignment.h @@ -60,6 +60,12 @@ struct _GtkAlignment struct _GtkAlignmentClass { GtkBinClass parent_class; + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); }; diff --git a/gtk/gtkapplication.h b/gtk/gtkapplication.h index 8fafd4ef5..c915e2dc8 100644 --- a/gtk/gtkapplication.h +++ b/gtk/gtkapplication.h @@ -56,7 +56,7 @@ struct _GtkApplicationClass GApplicationClass parent_class; /*< private >*/ - gpointer padding[12]; + gpointer padding[16]; }; GType gtk_application_get_type (void) G_GNUC_CONST; diff --git a/gtk/gtkarrow.h b/gtk/gtkarrow.h index dc7f5bd13..ee2a4e317 100644 --- a/gtk/gtkarrow.h +++ b/gtk/gtkarrow.h @@ -60,6 +60,12 @@ struct _GtkArrow struct _GtkArrowClass { GtkMiscClass parent_class; + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); }; diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h index e1e194e1a..1106f55c3 100644 --- a/gtk/gtkaspectframe.h +++ b/gtk/gtkaspectframe.h @@ -59,6 +59,12 @@ struct _GtkAspectFrame struct _GtkAspectFrameClass { GtkFrameClass parent_class; + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); }; diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h index df842f7fe..a46ba4d5b 100644 --- a/gtk/gtkbbox.h +++ b/gtk/gtkbbox.h @@ -59,6 +59,12 @@ struct _GtkButtonBox struct _GtkButtonBoxClass { GtkBoxClass parent_class; + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); }; diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h index c264134d1..0a903728d 100644 --- a/gtk/gtkbin.h +++ b/gtk/gtkbin.h @@ -60,6 +60,12 @@ struct _GtkBin struct _GtkBinClass { GtkContainerClass parent_class; + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); }; diff --git a/gtk/gtkcssprovider.h b/gtk/gtkcssprovider.h index 836abb01d..b5579bbc3 100644 --- a/gtk/gtkcssprovider.h +++ b/gtk/gtkcssprovider.h @@ -52,6 +52,12 @@ struct _GtkCssProvider struct _GtkCssProviderClass { GObjectClass parent_class; + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); }; GType gtk_css_provider_get_type (void) G_GNUC_CONST; diff --git a/gtk/gtkfixed.h b/gtk/gtkfixed.h index 00569c3f2..720c814b2 100644 --- a/gtk/gtkfixed.h +++ b/gtk/gtkfixed.h @@ -60,6 +60,12 @@ struct _GtkFixed 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); }; struct _GtkFixedChild diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h index 9ee87e16f..c8fe166b1 100644 --- a/gtk/gtkicontheme.h +++ b/gtk/gtkicontheme.h @@ -58,6 +58,12 @@ struct _GtkIconThemeClass GObjectClass parent_class; void (* changed) (GtkIconTheme *icon_theme); + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); }; /** diff --git a/gtk/gtkmisc.h b/gtk/gtkmisc.h index 1ca83091b..269265f61 100644 --- a/gtk/gtkmisc.h +++ b/gtk/gtkmisc.h @@ -60,6 +60,12 @@ struct _GtkMisc struct _GtkMiscClass { GtkWidgetClass parent_class; + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); }; diff --git a/gtk/gtkmodifierstyle.h b/gtk/gtkmodifierstyle.h index e211a8070..59213ad53 100644 --- a/gtk/gtkmodifierstyle.h +++ b/gtk/gtkmodifierstyle.h @@ -45,6 +45,12 @@ struct _GtkModifierStyle struct _GtkModifierStyleClass { GObjectClass parent_class; + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); }; GType gtk_modifier_style_get_type (void) G_GNUC_CONST; diff --git a/gtk/gtknumerableicon.h b/gtk/gtknumerableicon.h index 277d2dd46..88d465363 100644 --- a/gtk/gtknumerableicon.h +++ b/gtk/gtknumerableicon.h @@ -55,7 +55,7 @@ struct _GtkNumerableIconClass { GEmblemedIconClass parent_class; /* padding for future class expansion */ - gpointer padding[8]; + gpointer padding[16]; }; GType gtk_numerable_icon_get_type (void) G_GNUC_CONST; diff --git a/gtk/gtkstatusicon.h b/gtk/gtkstatusicon.h index 6d93d2aca..5508066ca 100644 --- a/gtk/gtkstatusicon.h +++ b/gtk/gtkstatusicon.h @@ -75,6 +75,8 @@ struct _GtkStatusIconClass void (*__gtk_reserved1); void (*__gtk_reserved2); + void (*__gtk_reserved3); + void (*__gtk_reserved4); }; GType gtk_status_icon_get_type (void) G_GNUC_CONST; diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h index 5064afc12..80d348848 100644 --- a/gtk/gtkstylecontext.h +++ b/gtk/gtkstylecontext.h @@ -52,6 +52,12 @@ struct _GtkStyleContextClass GObjectClass parent_class; void (* changed) (GtkStyleContext *context); + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); }; /* Default set of properties that GtkStyleContext may contain */ diff --git a/gtk/gtkstyleproperties.h b/gtk/gtkstyleproperties.h index 113fe44f9..739a56502 100644 --- a/gtk/gtkstyleproperties.h +++ b/gtk/gtkstyleproperties.h @@ -52,6 +52,12 @@ struct _GtkStyleProperties struct _GtkStylePropertiesClass { GObjectClass parent_class; + + /* Padding for future expansion */ + void (*_gtk_reserved1) (void); + void (*_gtk_reserved2) (void); + void (*_gtk_reserved3) (void); + void (*_gtk_reserved4) (void); }; typedef gboolean (* GtkStylePropertyParser) (const gchar *string,