Massive padding addition to class structures.

Sat Feb 23 11:54:12 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/*.h gdk/*.h: Massive padding addition to class structures.

        * gtk/gtktextmark.h: Fix a FIXME about G_CONST_RETURN.

ChangeLog

@@ -1,3 +1,9 @@
+Sat Feb 23 11:54:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/*.h gdk/*.h: Massive padding addition to class structures.
+
+	* gtk/gtktextmark.h: Fix a FIXME about G_CONST_RETURN.
+
 Fri Feb 22 20:28:18 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrange.c: Applied patch from Thomas Leonard to make

ChangeLog.pre-2-0

@@ -1,3 +1,9 @@
+Sat Feb 23 11:54:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/*.h gdk/*.h: Massive padding addition to class structures.
+
+	* gtk/gtktextmark.h: Fix a FIXME about G_CONST_RETURN.
+
 Fri Feb 22 20:28:18 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrange.c: Applied patch from Thomas Leonard to make

ChangeLog.pre-2-10

@@ -1,3 +1,9 @@
+Sat Feb 23 11:54:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/*.h gdk/*.h: Massive padding addition to class structures.
+
+	* gtk/gtktextmark.h: Fix a FIXME about G_CONST_RETURN.
+
 Fri Feb 22 20:28:18 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrange.c: Applied patch from Thomas Leonard to make

ChangeLog.pre-2-2

@@ -1,3 +1,9 @@
+Sat Feb 23 11:54:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/*.h gdk/*.h: Massive padding addition to class structures.
+
+	* gtk/gtktextmark.h: Fix a FIXME about G_CONST_RETURN.
+
 Fri Feb 22 20:28:18 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrange.c: Applied patch from Thomas Leonard to make

ChangeLog.pre-2-4

@@ -1,3 +1,9 @@
+Sat Feb 23 11:54:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/*.h gdk/*.h: Massive padding addition to class structures.
+
+	* gtk/gtktextmark.h: Fix a FIXME about G_CONST_RETURN.
+
 Fri Feb 22 20:28:18 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrange.c: Applied patch from Thomas Leonard to make

ChangeLog.pre-2-6

@@ -1,3 +1,9 @@
+Sat Feb 23 11:54:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/*.h gdk/*.h: Massive padding addition to class structures.
+
+	* gtk/gtktextmark.h: Fix a FIXME about G_CONST_RETURN.
+
 Fri Feb 22 20:28:18 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrange.c: Applied patch from Thomas Leonard to make

ChangeLog.pre-2-8

@@ -1,3 +1,9 @@
+Sat Feb 23 11:54:12 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/*.h gdk/*.h: Massive padding addition to class structures.
+
+	* gtk/gtktextmark.h: Fix a FIXME about G_CONST_RETURN.
+
 Fri Feb 22 20:28:18 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkrange.c: Applied patch from Thomas Leonard to make

docs/reference/gtk/tmpl/gtkstyle.sgml

@@ -86,6 +86,18 @@ Returns whether the style is attached to a window.
 @draw_expander: 
 @draw_layout: 
 @draw_resize_grip: 
+@_gtk_reserved1: 
+@_gtk_reserved2: 
+@_gtk_reserved3: 
+@_gtk_reserved4: 
+@_gtk_reserved5: 
+@_gtk_reserved6: 
+@_gtk_reserved7: 
+@_gtk_reserved8: 
+@_gtk_reserved9: 
+@_gtk_reserved10: 
+@_gtk_reserved11: 
+@_gtk_reserved12: 
 
 <!-- ##### FUNCTION gtk_style_new ##### -->
 <para>

docs/reference/gtk/tmpl/gtktreeview.sgml

@@ -733,6 +733,13 @@ GtkTreeView
 @arg2: 
 @arg3: 
 
+<!-- ##### SIGNAL GtkTreeView::focus-column-header ##### -->
+<para>
+
+</para>
+
+@treeview: the object which received the signal.
+
 <!-- ##### SIGNAL GtkTreeView::move-cursor ##### -->
 <para>
 
@@ -834,6 +841,13 @@ GtkTreeView
 
 @treeview: the object which received the signal.
 
+<!-- ##### SIGNAL GtkTreeView::unselect-all ##### -->
+<para>
+
+</para>
+
+@treeview: the object which received the signal.
+
 <!-- ##### ARG GtkTreeView:model ##### -->
 <para>
 

gdk/gdkdrawable.h

@@ -154,12 +154,22 @@ struct _GdkDrawableClass
 				  gint            width,
 				  gint            height);
 
-  void         (*_gdk_reserved1) (void);
-  void         (*_gdk_reserved2) (void);
-  void         (*_gdk_reserved3) (void);
-  void         (*_gdk_reserved4) (void);
-  void         (*_gdk_reserved5) (void);
-  void         (*_gdk_reserved6) (void);
+  /* Padding for future expansion */
+  void         (*_gdk_reserved1)  (void);
+  void         (*_gdk_reserved2)  (void);
+  void         (*_gdk_reserved3)  (void);
+  void         (*_gdk_reserved4)  (void);
+  void         (*_gdk_reserved5)  (void);
+  void         (*_gdk_reserved6)  (void);
+  void         (*_gdk_reserved7)  (void);
+  void         (*_gdk_reserved9)  (void);
+  void         (*_gdk_reserved10) (void);
+  void         (*_gdk_reserved11) (void);
+  void         (*_gdk_reserved12) (void);
+  void         (*_gdk_reserved13) (void);
+  void         (*_gdk_reserved14) (void);
+  void         (*_gdk_reserved15) (void);
+  void         (*_gdk_reserved16) (void);
 };
 
 GType           gdk_drawable_get_type     (void);

gdk/gdkgc.h

@@ -183,6 +183,12 @@ struct _GdkGCClass
 			  gint	          dash_offset,
 			  gint8           dash_list[],
 			  gint            n);
+  
+  /* Padding for future expansion */
+  void         (*_gdk_reserved1)  (void);
+  void         (*_gdk_reserved2)  (void);
+  void         (*_gdk_reserved3)  (void);
+  void         (*_gdk_reserved4)  (void);
 };
 
 

gtk/gtkaccelgroup.h

@@ -70,6 +70,7 @@ struct _GtkAccelGroup
   guint		      n_accels;
   GtkAccelGroupEntry *priv_accels;
 };
+
 struct _GtkAccelGroupClass
 {
   GObjectClass parent_class;
@@ -78,7 +79,14 @@ struct _GtkAccelGroupClass
 				 guint           keyval,
 				 GdkModifierType modifier,
 				 GClosure       *accel_closure);
+  
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
+
 struct _GtkAccelKey
 {
   guint           accel_key;

gtk/gtkaccellabel.h

@@ -75,6 +75,12 @@ struct _GtkAccelLabelClass
   gchar		*mod_separator;
   gchar		*accel_seperator;
   guint		 latin1_to_char : 1;
+  
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 #ifndef GTK_DISABLE_DEPRECATED

gtk/gtkaccessible.h

@@ -60,6 +60,12 @@ struct _GtkAccessibleClass
   AtkObjectClass parent_class;
 
   void (*connect_widget_destroyed)              (GtkAccessible     *accessible);
+  
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 void gtk_accessible_connect_widget_destroyed    (GtkAccessible     *accessible);

gtk/gtkadjustment.h

@@ -66,6 +66,12 @@ struct _GtkAdjustmentClass
   
   void (* changed)	 (GtkAdjustment *adjustment);
   void (* value_changed) (GtkAdjustment *adjustment);
+  
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkbutton.h

@@ -78,6 +78,12 @@ struct _GtkButtonClass
   void (* enter)    (GtkButton *button);
   void (* leave)    (GtkButton *button);
   void (* activate) (GtkButton *button);
+  
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkcalendar.h

@@ -89,6 +89,12 @@ struct _GtkCalendar
   
   gpointer private_data;
   gchar grow_space [32];
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 struct _GtkCalendarClass

gtk/gtkcellrenderer.h

@@ -104,6 +104,12 @@ struct _GtkCellRendererClass
 				      GdkRectangle         *background_area,
 				      GdkRectangle         *cell_area,
 				      GtkCellRendererState  flags);
+
+  /* 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/gtkcellrendererpixbuf.h

@@ -49,6 +49,12 @@ struct _GtkCellRendererPixbuf
 struct _GtkCellRendererPixbufClass
 {
   GtkCellRendererClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GtkType          gtk_cell_renderer_pixbuf_get_type (void);

gtk/gtkcellrenderertext.h

@@ -82,6 +82,12 @@ struct _GtkCellRendererTextClass
   void (* edited) (GtkCellRendererText *cell_renderer_text,
 		   const gchar         *path,
 		   const gchar         *new_text);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GtkType          gtk_cell_renderer_text_get_type (void);

gtk/gtkcellrenderertoggle.h

@@ -53,6 +53,12 @@ struct _GtkCellRendererToggleClass
 
   void (* toggled) (GtkCellRendererToggle *cell_renderer_toggle,
 		    const gchar                 *path);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GtkType          gtk_cell_renderer_toggle_get_type  (void);

gtk/gtkcheckbutton.h

@@ -59,6 +59,12 @@ struct _GtkCheckButtonClass
 
   void (* draw_indicator) (GtkCheckButton *check_button,
 			   GdkRectangle   *area);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkcheckmenuitem.h

@@ -64,6 +64,12 @@ struct _GtkCheckMenuItemClass
   void (* toggled)	  (GtkCheckMenuItem *check_menu_item);
   void (* draw_indicator) (GtkCheckMenuItem *check_menu_item,
 			   GdkRectangle	    *area);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkcolorsel.h

@@ -63,6 +63,12 @@ struct _GtkColorSelectionClass
   GtkVBoxClass parent_class;
 
   void (*color_changed)	(GtkColorSelection *color_selection);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkcolorseldialog.h

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

gtk/gtkcombo.h

@@ -69,6 +69,12 @@ struct _GtkCombo {
 
 struct _GtkComboClass {
 	GtkHBoxClass parent_class;
+
+        /* Padding for future expansion */
+        void (*_gtk_reserved1) (void);
+        void (*_gtk_reserved2) (void);
+        void (*_gtk_reserved3) (void);
+        void (*_gtk_reserved4) (void);
 };
 
 GtkType    gtk_combo_get_type              (void) G_GNUC_CONST;

gtk/gtkcontainer.h

@@ -93,9 +93,12 @@ struct _GtkContainerClass
 				 guint            property_id,
 				 GValue          *value,
 				 GParamSpec      *pspec);
+
   /* Padding for future expansion */
-  GtkFunction pad1;
-  GtkFunction pad2;
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 /* Application-level methods */

gtk/gtkcurve.h

@@ -87,6 +87,12 @@ struct _GtkCurveClass
   GtkDrawingAreaClass parent_class;
 
   void (* curve_type_changed) (GtkCurve *curve);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkdialog.h

@@ -113,6 +113,12 @@ struct _GtkDialogClass
   /* Keybinding signals */
 
   void (* close)    (GtkDialog *dialog);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkdrawingarea.h

@@ -58,6 +58,12 @@ struct _GtkDrawingArea
 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);
 };
 
 

gtk/gtkentry.h

@@ -139,6 +139,12 @@ struct _GtkEntryClass
   void (* copy_clipboard)     (GtkEntry       *entry);
   void (* paste_clipboard)    (GtkEntry       *entry);
   void (* toggle_overwrite)   (GtkEntry       *entry);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GtkType    gtk_entry_get_type       		(void) G_GNUC_CONST;

gtk/gtkfilesel.h

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

gtk/gtkfontsel.h

@@ -90,6 +90,12 @@ struct _GtkFontSelection
 struct _GtkFontSelectionClass
 {
   GtkVBoxClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
@@ -114,6 +120,12 @@ struct _GtkFontSelectionDialog
 struct _GtkFontSelectionDialogClass
 {
   GtkDialogClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkgamma.h

@@ -74,6 +74,12 @@ struct _GtkGammaCurve
 struct _GtkGammaCurveClass
 {
   GtkVBoxClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkhandlebox.h

@@ -85,6 +85,12 @@ struct _GtkHandleBoxClass
 				 GtkWidget	*child);
   void	(*child_detached)	(GtkHandleBox	*handle_box,
 				 GtkWidget	*child);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkiconfactory.h

@@ -54,7 +54,11 @@ struct _GtkIconFactoryClass
 {
   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_icon_factory_get_type (void);

gtk/gtkimage.h

@@ -123,6 +123,12 @@ struct _GtkImage
 struct _GtkImageClass
 {
   GtkMiscClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GtkType    gtk_image_get_type (void) G_GNUC_CONST;

gtk/gtkimcontext.h

@@ -83,10 +83,13 @@ struct _GtkIMContextClass
 				   gchar         **text,
 				   gint           *cursor_index);
 
-  /* Some padding for future expansion. Must be left NULL for now */
-  void     (*pad1)                (void);
-  void     (*pad2)                (void);
-  void     (*pad3)                (void);
+  /* 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);
 };
 
 GtkType       gtk_im_context_get_type           (void) G_GNUC_CONST;

gtk/gtkimmulticontext.h

@@ -53,6 +53,12 @@ struct _GtkIMMulticontext
 struct _GtkIMMulticontextClass
 {
   GtkIMContextClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GtkType       gtk_im_multicontext_get_type (void) G_GNUC_CONST;

gtk/gtkinputdialog.h

@@ -84,6 +84,12 @@ struct _GtkInputDialogClass
 					GdkDevice         *device);
   void (* disable_device)              (GtkInputDialog    *inputd,
 					GdkDevice         *device);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkinvisible.h

@@ -55,6 +55,12 @@ struct _GtkInvisible
 struct _GtkInvisibleClass
 {
   GtkWidgetClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GtkType	       gtk_invisible_get_type	     (void) G_GNUC_CONST;

gtk/gtkitem.h

@@ -60,6 +60,12 @@ struct _GtkItemClass
   void (* select)   (GtkItem *item);
   void (* deselect) (GtkItem *item);
   void (* toggle)   (GtkItem *item);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkitemfactory.h

@@ -80,6 +80,12 @@ struct _GtkItemFactoryClass
   GtkObjectClass	 object_class;
 
   GHashTable		*item_ht;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 struct _GtkItemFactoryEntry

gtk/gtklabel.h

@@ -88,6 +88,12 @@ struct _GtkLabelClass
   /* Hook to customize right-click popup for selectable labels */
   void (* populate_popup)   (GtkLabel       *label,
                              GtkMenu        *menu);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GtkType               gtk_label_get_type          (void) G_GNUC_CONST;

gtk/gtklayout.h

@@ -51,7 +51,8 @@ extern "C" {
 typedef struct _GtkLayout        GtkLayout;
 typedef struct _GtkLayoutClass   GtkLayoutClass;
 
-struct _GtkLayout {
+struct _GtkLayout
+{
   GtkContainer container;
 
   GList *children;
@@ -73,12 +74,19 @@ struct _GtkLayout {
   guint freeze_count;
 };
 
-struct _GtkLayoutClass {
+struct _GtkLayoutClass
+{
   GtkContainerClass parent_class;
 
   void  (*set_scroll_adjustments)   (GtkLayout	    *layout,
 				     GtkAdjustment  *hadjustment,
 				     GtkAdjustment  *vadjustment);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GtkType        gtk_layout_get_type        (void) G_GNUC_CONST;

gtk/gtkliststore.h

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

gtk/gtkmenu.h

@@ -112,6 +112,12 @@ struct _GtkMenu
 struct _GtkMenuClass
 {
   GtkMenuShellClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkmenubar.h

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

gtk/gtkmenuitem.h

@@ -85,6 +85,12 @@ struct _GtkMenuItemClass
 				 gint        *requisition);
   void (* toggle_size_allocate) (GtkMenuItem *menu_item,
 				 gint         allocation);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkmenushell.h

@@ -86,6 +86,12 @@ struct _GtkMenuShellClass
   void (*insert)           (GtkMenuShell *menu_shell,
 			    GtkWidget    *child,
 			    gint          position);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkmessagedialog.h

@@ -76,7 +76,11 @@ struct _GtkMessageDialogClass
 {
   GtkDialogClass parent_class;
 
-  
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GtkType    gtk_message_dialog_get_type (void);

gtk/gtknotebook.h

@@ -103,6 +103,12 @@ struct _GtkNotebookClass
                                 gint               offset);
   void (* move_focus_out)      (GtkNotebook       *notebook,
 				GtkDirectionType   direction);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 /***********************************************************

gtk/gtkoptionmenu.h

@@ -64,6 +64,12 @@ struct _GtkOptionMenuClass
   GtkButtonClass parent_class;
 
   void (*changed) (GtkOptionMenu *option_menu);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkpaned.h

@@ -96,6 +96,12 @@ struct _GtkPanedClass
 				    gboolean       reverse);
   gboolean (* accept_position)     (GtkPaned	  *paned);
   gboolean (* cancel_position)     (GtkPaned	  *paned);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkplug.h

@@ -64,6 +64,12 @@ struct _GtkPlugClass
   GtkWindowClass parent_class;
 
   void (*embedded) (GtkPlug *plug);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkprogress.h

@@ -74,6 +74,12 @@ struct _GtkProgressClass
   void (* paint)            (GtkProgress *progress);
   void (* update)           (GtkProgress *progress);
   void (* act_mode_enter)   (GtkProgress *progress);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 /* This entire interface is deprecated. Use GtkProgressBar

gtk/gtkprogressbar.h

@@ -84,6 +84,12 @@ struct _GtkProgressBar
 struct _GtkProgressBarClass
 {
   GtkProgressClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkradiobutton.h

@@ -58,6 +58,12 @@ struct _GtkRadioButton
 struct _GtkRadioButtonClass
 {
   GtkCheckButtonClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkradiomenuitem.h

@@ -58,6 +58,12 @@ struct _GtkRadioMenuItem
 struct _GtkRadioMenuItemClass
 {
   GtkCheckMenuItemClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkrange.h

@@ -119,6 +119,12 @@ struct _GtkRangeClass
   /* Virtual functions */
   void (* get_range_border) (GtkRange     *range,
                              GtkBorder    *border);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkrc.h

@@ -114,6 +114,12 @@ struct _GtkRcStyleClass
   /* Create an empty style suitable to this RC style
    */
   GtkStyle * (*create_style) (GtkRcStyle *rc_style);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 void	  _gtk_rc_init			(void);

gtk/gtkruler.h

@@ -88,6 +88,12 @@ struct _GtkRulerClass
 
   void (* draw_ticks) (GtkRuler *ruler);
   void (* draw_pos)   (GtkRuler *ruler);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 struct _GtkRulerMetric

gtk/gtkscale.h

@@ -65,6 +65,12 @@ struct _GtkScaleClass
                            gdouble   value);  
   
   void (* draw_value) (GtkScale *scale);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GtkType gtk_scale_get_type        (void) G_GNUC_CONST;

gtk/gtkscrollbar.h

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

gtk/gtkscrolledwindow.h

@@ -87,6 +87,12 @@ struct _GtkScrolledWindowClass
 
   void (* move_focus_out) (GtkScrolledWindow *scrolled_window,
 			   GtkDirectionType   direction);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtksizegroup.h

@@ -55,6 +55,12 @@ struct _GtkSizeGroup
 struct _GtkSizeGroupClass
 {
   GObjectClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 /**

gtk/gtksocket.h

@@ -73,6 +73,12 @@ struct _GtkSocketClass
 
   void     (*plug_added)   (GtkSocket *socket);
   gboolean (*plug_removed) (GtkSocket *socket);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkspinbutton.h

@@ -110,6 +110,12 @@ struct _GtkSpinButtonClass
   /* Action signals for keybindings, do not connect to these */
   void (*change_value) (GtkSpinButton *spin_button,
 			GtkScrollType  scroll);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkstatusbar.h

@@ -76,6 +76,12 @@ struct _GtkStatusbarClass
   void	(*text_popped)	(GtkStatusbar	*statusbar,
 			 guint		 context_id,
 			 const gchar	*text);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtkstyle.h

@@ -399,6 +399,19 @@ struct _GtkStyleClass
 				 gint			 width,
 				 gint			 height);
 
+  /* 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);
+  void (*_gtk_reserved9)  (void);
+  void (*_gtk_reserved10) (void);
+  void (*_gtk_reserved11) (void);
+  void (*_gtk_reserved12) (void);
 };
 
 struct _GtkBorder

gtk/gtktearoffmenuitem.h

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

gtk/gtktextbuffer.h

@@ -126,12 +126,13 @@ struct _GtkTextBufferClass
   void (* begin_user_action)  (GtkTextBuffer *buffer);
   void (* end_user_action)    (GtkTextBuffer *buffer);
 
-  GtkFunction pad1;
-  GtkFunction pad2;
-  GtkFunction pad3;
-  GtkFunction pad4;
-  GtkFunction pad5;
-  GtkFunction pad6;
+  /* 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);
 };
 
 GType        gtk_text_buffer_get_type       (void) G_GNUC_CONST;

gtk/gtktextchild.h

@@ -60,6 +60,11 @@ struct _GtkTextChildAnchorClass
 {
   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_text_child_anchor_get_type (void) G_GNUC_CONST;

gtk/gtktextlayout.h

@@ -206,8 +206,11 @@ struct _GtkTextLayoutClass
                                  gint               x,
                                  gint               y);
 
-  GtkFunction pad1;
-  GtkFunction pad2;
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 struct _GtkTextAttrAppearance

gtk/gtktextmark.h

@@ -77,6 +77,11 @@ struct _GtkTextMarkClass
 {
   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_text_mark_get_type   (void) G_GNUC_CONST;
@@ -85,12 +90,10 @@ void           gtk_text_mark_set_visible (GtkTextMark *mark,
                                           gboolean     setting);
 gboolean       gtk_text_mark_get_visible (GtkTextMark *mark);
 
-/* FIXME gconst */
-const char  *  gtk_text_mark_get_name    (GtkTextMark *mark);
-gboolean       gtk_text_mark_get_deleted (GtkTextMark *mark);
-GtkTextBuffer* gtk_text_mark_get_buffer  (GtkTextMark *mark);
-gboolean       gtk_text_mark_get_left_gravity (GtkTextMark *mark);
-
+G_CONST_RETURN gchar* gtk_text_mark_get_name         (GtkTextMark *mark);
+gboolean              gtk_text_mark_get_deleted      (GtkTextMark *mark);
+GtkTextBuffer*        gtk_text_mark_get_buffer       (GtkTextMark *mark);
+gboolean              gtk_text_mark_get_left_gravity (GtkTextMark *mark);
 
 #ifdef __cplusplus
 }

gtk/gtktexttag.h

@@ -85,8 +85,11 @@ struct _GtkTextTagClass
                       GdkEvent          *event,        /* the event itself */
                       const GtkTextIter *iter);        /* location of event in buffer */
 
-  GtkFunction pad1;
-  GtkFunction pad2;
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType        gtk_text_tag_get_type     (void) G_GNUC_CONST;

gtk/gtktexttagtable.h

@@ -20,7 +20,8 @@ typedef void (* GtkTextTagTableForeach) (GtkTextTag *tag, gpointer data);
 
 typedef struct _GtkTextTagTableClass GtkTextTagTableClass;
 
-struct _GtkTextTagTable {
+struct _GtkTextTagTable
+{
   GObject parent_instance;
 
   GHashTable *hash;
@@ -30,15 +31,19 @@ struct _GtkTextTagTable {
   GSList *buffers;
 };
 
-struct _GtkTextTagTableClass {
+struct _GtkTextTagTableClass
+{
   GObjectClass parent_class;
 
   void (* tag_changed) (GtkTextTagTable *table, GtkTextTag *tag, gboolean size_changed);
   void (* tag_added) (GtkTextTagTable *table, GtkTextTag *tag);
   void (* tag_removed) (GtkTextTagTable *table, GtkTextTag *tag);
 
-  GtkFunction pad1;
-  GtkFunction pad2;
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GType          gtk_text_tag_table_get_type (void) G_GNUC_CONST;

gtk/gtktextview.h

@@ -201,15 +201,15 @@ struct _GtkTextViewClass
                              GtkDirectionType direction);  
   
   
-  GtkFunction pad1;
-  GtkFunction pad2;
-  GtkFunction pad3;
-  GtkFunction pad4;
-  
-  GtkFunction pad5;
-  GtkFunction pad6;
-  GtkFunction pad7;
-  GtkFunction pad8;
+  /* 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);
 };
 
 GtkType        gtk_text_view_get_type              (void) G_GNUC_CONST;

gtk/gtktipsquery.h

@@ -86,6 +86,12 @@ struct	_GtkTipsQueryClass
 				 const gchar	*tip_text,
 				 const gchar	*tip_private,
 				 GdkEventButton	*event);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtktogglebutton.h

@@ -62,6 +62,12 @@ struct _GtkToggleButtonClass
   GtkButtonClass parent_class;
 
   void (* toggled) (GtkToggleButton *toggle_button);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtktoolbar.h

@@ -107,6 +107,12 @@ struct _GtkToolbarClass
 				GtkOrientation   orientation);
   void (* style_changed)       (GtkToolbar      *toolbar,
 				GtkToolbarStyle  style);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtktooltips.h

@@ -75,6 +75,12 @@ struct _GtkTooltips
 struct _GtkTooltipsClass
 {
   GtkObjectClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GtkType		 gtk_tooltips_get_type	   (void) G_GNUC_CONST;

gtk/gtktreemodelsort.h

@@ -67,6 +67,12 @@ struct _GtkTreeModelSort
 struct _GtkTreeModelSortClass
 {
   GObjectClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtktreeselection.h

@@ -62,6 +62,12 @@ struct _GtkTreeSelectionClass
   GObjectClass parent_class;
 
   void (* changed) (GtkTreeSelection *selection);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtktreestore.h

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

gtk/gtktreeview.h

@@ -102,6 +102,12 @@ struct _GtkTreeViewClass
   void     (* select_cursor_parent)       (GtkTreeView       *tree_view);
   void     (* start_interactive_search)   (GtkTreeView       *tree_view);
   void     (* focus_column_header)        (GtkTreeView       *tree_view);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 

gtk/gtktreeviewcolumn.h

@@ -108,6 +108,12 @@ struct _GtkTreeViewColumnClass
   GtkObjectClass parent_class;
 
   void (*clicked) (GtkTreeViewColumn *tree_column);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GtkType                 gtk_tree_view_column_get_type            (void);

gtk/gtkwidget.h

@@ -402,10 +402,14 @@ struct _GtkWidgetClass
   AtkObject*   (* get_accessible)  (GtkWidget          *widget);
 
   /* Padding for future expansion */
-  GtkFunction pad1;
-  GtkFunction pad2;
-  GtkFunction pad3;
-  GtkFunction pad4;
+  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);
 };
 
 struct _GtkWidgetAuxInfo

gtk/gtkwindow.h

@@ -128,6 +128,12 @@ struct _GtkWindowClass
                                         GtkDirectionType direction);
   
   void	   (*keys_changed)	       (GtkWindow	*window);
+  
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 #define GTK_TYPE_WINDOW_GROUP             (gtk_window_group_get_type ())
@@ -147,6 +153,12 @@ struct _GtkWindowGroup
 struct _GtkWindowGroupClass
 {
   GObjectClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 GtkType    gtk_window_get_type                 (void) G_GNUC_CONST;