Add padding to class structs

docs/reference/gdk/tmpl/general.sgml

@@ -335,6 +335,13 @@ available.
 @void: 
 
 
+<!-- ##### MACRO gdk_error_trap_pop ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### FUNCTION gdk_error_trap_pop_ignored ##### -->
 <para>
 

gtk/gtkaction.h

@@ -79,6 +79,7 @@ struct _GtkActionClass
   GtkWidget *(* create_menu)        (GtkAction *action);
 
   /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);

gtk/gtkbox.h

@@ -61,6 +61,12 @@ struct _GtkBox
 struct _GtkBoxClass
 {
   GtkContainerClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkcalendar.h

@@ -115,7 +115,12 @@ struct _GtkCalendarClass
   void (* next_month)			(GtkCalendar *calendar);
   void (* prev_year)			(GtkCalendar *calendar);
   void (* next_year)			(GtkCalendar *calendar);
-  
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkcellrenderer.h

@@ -125,6 +125,8 @@ struct _GtkCellRendererClass
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType              gtk_cell_renderer_get_type       (void) G_GNUC_CONST;

gtk/gtkcellrenderercombo.h

@@ -51,6 +51,12 @@ struct _GtkCellRendererCombo
 struct _GtkCellRendererComboClass
 {
   GtkCellRendererTextClass parent;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType            gtk_cell_renderer_combo_get_type (void) G_GNUC_CONST;

gtk/gtkcellrendererspin.h

@@ -50,6 +50,12 @@ struct _GtkCellRendererSpin
 struct _GtkCellRendererSpinClass
 {
   GtkCellRendererTextClass parent;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType            gtk_cell_renderer_spin_get_type (void);

gtk/gtkcellview.h

@@ -52,6 +52,12 @@ struct _GtkCellView
 struct _GtkCellViewClass
 {
   GtkWidgetClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType             gtk_cell_view_get_type               (void) G_GNUC_CONST;

gtk/gtkcombobox.h

@@ -60,9 +60,10 @@ struct _GtkComboBoxClass
   gchar *  (* get_active_text)  (GtkComboBox *combo_box);
 
   /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkcontainer.h

@@ -94,6 +94,10 @@ struct _GtkContainerClass
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
+  void (*_gtk_reserved5) (void);
+  void (*_gtk_reserved6) (void);
+  void (*_gtk_reserved7) (void);
+  void (*_gtk_reserved8) (void);
 };
 
 

gtk/gtkcustompaperunixdialog.h

@@ -52,9 +52,6 @@ struct _GtkCustomPaperUnixDialogClass
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
 };
 
 GType             gtk_custom_paper_unix_dialog_get_type           (void) G_GNUC_CONST;

gtk/gtkentry.h

@@ -156,6 +156,12 @@ struct _GtkEntryClass
   /* 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);
+  void (*_gtk_reserved7)      (void);
+  void (*_gtk_reserved8)      (void);
 };
 
 GType      gtk_entry_get_type       		(void) G_GNUC_CONST;

gtk/gtkentrybuffer.h

@@ -82,12 +82,14 @@ struct _GtkEntryBufferClass
                                           guint           n_chars);
 
   /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
   void (*_gtk_reserved5) (void);
+  void (*_gtk_reserved6) (void);
+  void (*_gtk_reserved7) (void);
+  void (*_gtk_reserved8) (void);
 };
 
 GType                     gtk_entry_buffer_get_type               (void) G_GNUC_CONST;

gtk/gtkentrycompletion.h

@@ -74,6 +74,8 @@ struct _GtkEntryCompletionClass
   /* Padding for future expansion */
   void (*_gtk_reserved0) (void);
   void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
 };
 
 /* core */

gtk/gtkeventbox.h

@@ -55,6 +55,12 @@ struct _GtkEventBox
 struct _GtkEventBoxClass
 {
   GtkBinClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType	   gtk_event_box_get_type           (void) G_GNUC_CONST;

gtk/gtkexpander.h

@@ -58,6 +58,12 @@ struct _GtkExpanderClass
    * state connect to notify:expanded.
    */
   void        (* activate) (GtkExpander *expander);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType                 gtk_expander_get_type          (void) G_GNUC_CONST;

gtk/gtkfilechooserbutton.h

@@ -56,13 +56,11 @@ struct _GtkFileChooserButtonClass
 
   void (* file_set) (GtkFileChooserButton *fc);
 
+  /* Padding for future expansion */
   void (*__gtk_reserved1);
   void (*__gtk_reserved2);
   void (*__gtk_reserved3);
   void (*__gtk_reserved4);
-  void (*__gtk_reserved5);
-  void (*__gtk_reserved6);
-  void (*__gtk_reserved7);
 };
 
 

gtk/gtkfilechooserdialog.h

@@ -51,6 +51,12 @@ struct _GtkFileChooserDialog
 struct _GtkFileChooserDialogClass
 {
   GtkDialogClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType      gtk_file_chooser_dialog_get_type         (void) G_GNUC_CONST;

gtk/gtkfilechooserwidget.h

@@ -51,6 +51,12 @@ struct _GtkFileChooserWidget
 struct _GtkFileChooserWidgetClass
 {
   GtkVBoxClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType      gtk_file_chooser_widget_get_type         (void) G_GNUC_CONST;

gtk/gtkframe.h

@@ -62,6 +62,12 @@ struct _GtkFrameClass
   GtkBinClass parent_class;
 
   void (*compute_child_allocation) (GtkFrame *frame, GtkAllocation *allocation);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkiconview.h

@@ -106,6 +106,12 @@ struct _GtkIconViewClass
 				      GtkMovementStep   step,
 				      gint              count);
   gboolean (* activate_cursor_item)  (GtkIconView      *icon_view);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType          gtk_icon_view_get_type          (void) G_GNUC_CONST;

gtk/gtkimagemenuitem.h

@@ -60,6 +60,12 @@ struct _GtkImageMenuItem
 struct _GtkImageMenuItemClass
 {
   GtkMenuItemClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkinfobar.h

@@ -80,8 +80,6 @@ struct _GtkInfoBarClass
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
 };
 
 GType          gtk_info_bar_get_type               (void) G_GNUC_CONST;

gtk/gtklabel.h

@@ -81,6 +81,11 @@ struct _GtkLabelClass
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+  void (*_gtk_reserved5) (void);
+  void (*_gtk_reserved6) (void);
+  void (*_gtk_reserved7) (void);
+  void (*_gtk_reserved8) (void);
 };
 
 GType                 gtk_label_get_type          (void) G_GNUC_CONST;

gtk/gtklinkbutton.h

@@ -74,6 +74,7 @@ struct _GtkLinkButtonClass
   gboolean (* activate_link) (GtkLinkButton *button);
 
   /*< private >*/
+  /* Padding for future expansion */
   void (*_gtk_padding1) (void);
   void (*_gtk_padding2) (void);
   void (*_gtk_padding3) (void);

gtk/gtkmenushell.h

@@ -94,6 +94,8 @@ struct _GtkMenuShellClass
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtknotebook.h

@@ -109,6 +109,7 @@ struct _GtkNotebookClass
                                 GtkWidget       *child,
                                 guint            page_num);
 
+  /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);

gtk/gtkoffscreenwindow.h

@@ -47,6 +47,12 @@ struct _GtkOffscreenWindow
 struct _GtkOffscreenWindowClass
 {
   GtkWindowClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType            gtk_offscreen_window_get_type    (void) G_GNUC_CONST;

gtk/gtkpagesetupunixdialog.h

@@ -56,9 +56,6 @@ struct _GtkPageSetupUnixDialogClass
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
 };
 
 GType 		  gtk_page_setup_unix_dialog_get_type	        (void) G_GNUC_CONST;

gtk/gtkprinter.h

@@ -87,6 +87,7 @@ struct _GtkPrinterClass
   void (*_gtk_reserved5) (void);
   void (*_gtk_reserved6) (void);
   void (*_gtk_reserved7) (void);
+  void (*_gtk_reserved8) (void);
 };
 
 GType                    gtk_printer_get_type              (void) G_GNUC_CONST;

gtk/gtkprinteroption.h

@@ -87,9 +87,6 @@ struct _GtkPrinterOptionClass
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
 };
 
 GType   gtk_printer_option_get_type       (void) G_GNUC_CONST;

gtk/gtkprinteroptionset.h

@@ -62,9 +62,6 @@ struct _GtkPrinterOptionSetClass
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
 };
 
 typedef void (*GtkPrinterOptionSetFunc) (GtkPrinterOption  *option,

gtk/gtkprinteroptionwidget.h

@@ -48,6 +48,12 @@ struct _GtkPrinterOptionWidgetClass
   GtkHBoxClass parent_class;
 
   void (*changed) (GtkPrinterOptionWidget *widget);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType	     gtk_printer_option_widget_get_type           (void) G_GNUC_CONST;

gtk/gtkprintjob.h

@@ -81,9 +81,6 @@ struct _GtkPrintJobClass
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
 };
 
 GType                    gtk_print_job_get_type               (void) G_GNUC_CONST;

gtk/gtkprintoperation.h

@@ -125,6 +125,8 @@ struct _GtkPrintOperationClass
   void (*_gtk_reserved4) (void);
   void (*_gtk_reserved5) (void);
   void (*_gtk_reserved6) (void);
+  void (*_gtk_reserved7) (void);
+  void (*_gtk_reserved8) (void);
 };
 
 #define GTK_PRINT_ERROR gtk_print_error_quark ()

gtk/gtkprintoperationpreview.h

@@ -65,6 +65,7 @@ struct _GtkPrintOperationPreviewIface
   void (*_gtk_reserved5) (void);
   void (*_gtk_reserved6) (void);
   void (*_gtk_reserved7) (void);
+  void (*_gtk_reserved8) (void);
 };
 
 GType   gtk_print_operation_preview_get_type       (void) G_GNUC_CONST;

gtk/gtkprintunixdialog.h

@@ -54,15 +54,11 @@ struct _GtkPrintUnixDialogClass
 {
   GtkDialogClass parent_class;
 
-
   /* 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);
-  void (*_gtk_reserved7) (void);
 };
 
 GType                gtk_print_unix_dialog_get_type                (void) G_GNUC_CONST;

gtk/gtkprogressbar.h

@@ -64,10 +64,6 @@ struct _GtkProgressBarClass
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-  void (*_gtk_reserved8) (void);
 };
 
 

gtk/gtkradiobutton.h

@@ -65,6 +65,7 @@ struct _GtkRadioButtonClass
   void (*group_changed) (GtkRadioButton *radio_button);
 
   /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);

gtk/gtkradiomenuitem.h

@@ -65,6 +65,7 @@ struct _GtkRadioMenuItemClass
   void (*group_changed) (GtkRadioMenuItem *radio_menu_item);
 
   /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);

gtk/gtkrange.h

@@ -85,6 +85,7 @@ struct _GtkRangeClass
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkrecentaction.h

@@ -53,6 +53,12 @@ struct _GtkRecentAction
 struct _GtkRecentActionClass
 {
   GtkActionClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType      gtk_recent_action_get_type         (void) G_GNUC_CONST;

gtk/gtkrecentchooserdialog.h

@@ -54,6 +54,12 @@ struct _GtkRecentChooserDialog
 struct _GtkRecentChooserDialogClass
 {
   GtkDialogClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkrecentchooserwidget.h

@@ -53,6 +53,12 @@ struct _GtkRecentChooserWidget
 struct _GtkRecentChooserWidgetClass
 {
   GtkVBoxClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType      gtk_recent_chooser_widget_get_type        (void) G_GNUC_CONST;

gtk/gtkscale.h

@@ -74,6 +74,7 @@ struct _GtkScaleClass
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType             gtk_scale_get_type           (void) G_GNUC_CONST;

gtk/gtkseparator.h

@@ -59,6 +59,12 @@ struct _GtkSeparator
 struct _GtkSeparatorClass
 {
   GtkWidgetClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkseparatormenuitem.h

@@ -56,6 +56,12 @@ struct _GtkSeparatorMenuItem
 struct _GtkSeparatorMenuItemClass
 {
   GtkMenuItemClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkspinbutton.h

@@ -100,6 +100,7 @@ struct _GtkSpinButtonClass
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkspinner.h

@@ -55,6 +55,12 @@ struct _GtkSpinner
 struct _GtkSpinnerClass
 {
   GtkWidgetClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType      gtk_spinner_get_type  (void) G_GNUC_CONST;

gtk/gtktable.h

@@ -62,6 +62,12 @@ struct _GtkTable
 struct _GtkTableClass
 {
   GtkContainerClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 struct _GtkTableChild

gtk/gtktextbuffer.h

@@ -137,7 +137,6 @@ struct _GtkTextBufferClass
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
 };
 
 GType        gtk_text_buffer_get_type       (void) G_GNUC_CONST;

gtk/gtktextview.h

@@ -121,6 +121,7 @@ struct _GtkTextViewClass
   void (*_gtk_reserved5) (void);
   void (*_gtk_reserved6) (void);
   void (*_gtk_reserved7) (void);
+  void (*_gtk_reserved8) (void);
 };
 
 GType          gtk_text_view_get_type              (void) G_GNUC_CONST;

gtk/gtktoolbar.h

@@ -85,6 +85,7 @@ struct _GtkToolbarClass
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType           gtk_toolbar_get_type                (void) G_GNUC_CONST;

gtk/gtktoolitemgroup.h

@@ -56,6 +56,12 @@ struct _GtkToolItemGroup
 struct _GtkToolItemGroupClass
 {
   GtkContainerClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType                 gtk_tool_item_group_get_type          (void) G_GNUC_CONST;

gtk/gtktoolpalette.h

@@ -81,8 +81,6 @@ struct _GtkToolPaletteClass
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
 };
 
 GType                          gtk_tool_palette_get_type              (void) G_GNUC_CONST;

gtk/gtktrayicon.h

@@ -46,12 +46,11 @@ struct _GtkTrayIconClass
 {
   GtkPlugClass parent_class;
 
-  void (*__gtk_reserved1);
-  void (*__gtk_reserved2);
-  void (*__gtk_reserved3);
-  void (*__gtk_reserved4);
-  void (*__gtk_reserved5);
-  void (*__gtk_reserved6);
+  /* Padding for future expansion */
+  void (*_gtk_reserved1);
+  void (*_gtk_reserved2);
+  void (*_gtk_reserved3);
+  void (*_gtk_reserved4);
 };
 
 GType          gtk_tray_icon_get_type         (void) G_GNUC_CONST;

gtk/gtktreemodelfilter.h

@@ -72,8 +72,10 @@ struct _GtkTreeModelFilterClass
                    gint                column);
 
   /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
   void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 /* base */

gtk/gtktreeview.h

@@ -108,11 +108,14 @@ struct _GtkTreeViewClass
   gboolean (* start_interactive_search)   (GtkTreeView       *tree_view);
 
   /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
+  void (*_gtk_reserved5) (void);
+  void (*_gtk_reserved6) (void);
+  void (*_gtk_reserved7) (void);
+  void (*_gtk_reserved8) (void);
 };
 
 

gtk/gtkuimanager.h

@@ -88,6 +88,8 @@ struct _GtkUIManagerClass {
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 typedef enum {

gtk/gtkviewport.h

@@ -66,6 +66,12 @@ struct _GtkViewportClass
   void	(*set_scroll_adjustments)	(GtkViewport	*viewport,
 					 GtkAdjustment	*hadjustment,
 					 GtkAdjustment	*vadjustment);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };