From e5d1ea8cfefac95f9011fffcff66345e4d2de70d Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 23 Feb 2002 20:22:05 +0000 Subject: [PATCH] Massive padding addition to class structures. Sat Feb 23 11:54:12 2002 Owen Taylor * gtk/*.h gdk/*.h: Massive padding addition to class structures. * gtk/gtktextmark.h: Fix a FIXME about G_CONST_RETURN. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ docs/reference/gtk/tmpl/gtkstyle.sgml | 12 ++++++++++++ docs/reference/gtk/tmpl/gtktreeview.sgml | 14 ++++++++++++++ gdk/gdkdrawable.h | 22 ++++++++++++++++------ gdk/gdkgc.h | 6 ++++++ gtk/gtkaccelgroup.h | 8 ++++++++ gtk/gtkaccellabel.h | 6 ++++++ gtk/gtkaccessible.h | 6 ++++++ gtk/gtkadjustment.h | 6 ++++++ gtk/gtkbutton.h | 6 ++++++ gtk/gtkcalendar.h | 6 ++++++ gtk/gtkcellrenderer.h | 6 ++++++ gtk/gtkcellrendererpixbuf.h | 6 ++++++ gtk/gtkcellrenderertext.h | 6 ++++++ gtk/gtkcellrenderertoggle.h | 6 ++++++ gtk/gtkcheckbutton.h | 6 ++++++ gtk/gtkcheckmenuitem.h | 6 ++++++ gtk/gtkcolorsel.h | 6 ++++++ gtk/gtkcolorseldialog.h | 6 ++++++ gtk/gtkcombo.h | 6 ++++++ gtk/gtkcontainer.h | 7 +++++-- gtk/gtkcurve.h | 6 ++++++ gtk/gtkdialog.h | 6 ++++++ gtk/gtkdrawingarea.h | 6 ++++++ gtk/gtkentry.h | 6 ++++++ gtk/gtkfilesel.h | 6 ++++++ gtk/gtkfontsel.h | 12 ++++++++++++ gtk/gtkgamma.h | 6 ++++++ gtk/gtkhandlebox.h | 6 ++++++ gtk/gtkiconfactory.h | 6 +++++- gtk/gtkimage.h | 6 ++++++ gtk/gtkimcontext.h | 11 +++++++---- gtk/gtkimmulticontext.h | 6 ++++++ gtk/gtkinputdialog.h | 6 ++++++ gtk/gtkinvisible.h | 6 ++++++ gtk/gtkitem.h | 6 ++++++ gtk/gtkitemfactory.h | 6 ++++++ gtk/gtklabel.h | 6 ++++++ gtk/gtklayout.h | 12 ++++++++++-- gtk/gtkliststore.h | 6 ++++++ gtk/gtkmenu.h | 6 ++++++ gtk/gtkmenubar.h | 6 ++++++ gtk/gtkmenuitem.h | 6 ++++++ gtk/gtkmenushell.h | 6 ++++++ gtk/gtkmessagedialog.h | 6 +++++- gtk/gtknotebook.h | 6 ++++++ gtk/gtkoptionmenu.h | 6 ++++++ gtk/gtkpaned.h | 6 ++++++ gtk/gtkplug.h | 6 ++++++ gtk/gtkprogress.h | 6 ++++++ gtk/gtkprogressbar.h | 6 ++++++ gtk/gtkradiobutton.h | 6 ++++++ gtk/gtkradiomenuitem.h | 6 ++++++ gtk/gtkrange.h | 6 ++++++ gtk/gtkrc.h | 6 ++++++ gtk/gtkruler.h | 6 ++++++ gtk/gtkscale.h | 6 ++++++ gtk/gtkscrollbar.h | 6 ++++++ gtk/gtkscrolledwindow.h | 6 ++++++ gtk/gtksizegroup.h | 6 ++++++ gtk/gtksocket.h | 6 ++++++ gtk/gtkspinbutton.h | 6 ++++++ gtk/gtkstatusbar.h | 6 ++++++ gtk/gtkstyle.h | 15 ++++++++++++++- gtk/gtktearoffmenuitem.h | 6 ++++++ gtk/gtktextbuffer.h | 13 +++++++------ gtk/gtktextchild.h | 5 +++++ gtk/gtktextlayout.h | 7 +++++-- gtk/gtktextmark.h | 15 +++++++++------ gtk/gtktexttag.h | 9 ++++++--- gtk/gtktexttagtable.h | 13 +++++++++---- gtk/gtktextview.h | 18 +++++++++--------- gtk/gtktipsquery.h | 6 ++++++ gtk/gtktogglebutton.h | 6 ++++++ gtk/gtktoolbar.h | 6 ++++++ gtk/gtktooltips.h | 6 ++++++ gtk/gtktreemodelsort.h | 6 ++++++ gtk/gtktreeselection.h | 6 ++++++ gtk/gtktreestore.h | 6 ++++++ gtk/gtktreeview.h | 6 ++++++ gtk/gtktreeviewcolumn.h | 6 ++++++ gtk/gtkwidget.h | 12 ++++++++---- gtk/gtkwindow.h | 12 ++++++++++++ 89 files changed, 592 insertions(+), 51 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2a8eb0e74..bc83b5098b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Feb 23 11:54:12 2002 Owen Taylor + + * 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 * gtk/gtkrange.c: Applied patch from Thomas Leonard to make diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f2a8eb0e74..bc83b5098b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sat Feb 23 11:54:12 2002 Owen Taylor + + * 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 * gtk/gtkrange.c: Applied patch from Thomas Leonard to make diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f2a8eb0e74..bc83b5098b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Feb 23 11:54:12 2002 Owen Taylor + + * 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 * gtk/gtkrange.c: Applied patch from Thomas Leonard to make diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f2a8eb0e74..bc83b5098b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Feb 23 11:54:12 2002 Owen Taylor + + * 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 * gtk/gtkrange.c: Applied patch from Thomas Leonard to make diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f2a8eb0e74..bc83b5098b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Feb 23 11:54:12 2002 Owen Taylor + + * 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 * gtk/gtkrange.c: Applied patch from Thomas Leonard to make diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f2a8eb0e74..bc83b5098b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Feb 23 11:54:12 2002 Owen Taylor + + * 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 * gtk/gtkrange.c: Applied patch from Thomas Leonard to make diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f2a8eb0e74..bc83b5098b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Feb 23 11:54:12 2002 Owen Taylor + + * 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 * gtk/gtkrange.c: Applied patch from Thomas Leonard to make diff --git a/docs/reference/gtk/tmpl/gtkstyle.sgml b/docs/reference/gtk/tmpl/gtkstyle.sgml index 1b15b8d189..3f3e9b6f8d 100644 --- a/docs/reference/gtk/tmpl/gtkstyle.sgml +++ b/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: diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml index ecf1f03125..38eecd8749 100644 --- a/docs/reference/gtk/tmpl/gtktreeview.sgml +++ b/docs/reference/gtk/tmpl/gtktreeview.sgml @@ -733,6 +733,13 @@ GtkTreeView @arg2: @arg3: + + + + + +@treeview: the object which received the signal. + @@ -834,6 +841,13 @@ GtkTreeView @treeview: the object which received the signal. + + + + + +@treeview: the object which received the signal. + diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h index 6d2d4d9b7b..9d4fd14117 100644 --- a/gdk/gdkdrawable.h +++ b/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); diff --git a/gdk/gdkgc.h b/gdk/gdkgc.h index e21837fad0..a7c34bfc6f 100644 --- a/gdk/gdkgc.h +++ b/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); }; diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h index 47d50cebae..f006f38054 100644 --- a/gtk/gtkaccelgroup.h +++ b/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; diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h index 03675bfac3..bef97381f5 100644 --- a/gtk/gtkaccellabel.h +++ b/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 diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h index 8b1ece6d42..35e4937fbc 100644 --- a/gtk/gtkaccessible.h +++ b/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); diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h index c9dafc91ed..4362ff3e7c 100644 --- a/gtk/gtkadjustment.h +++ b/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); }; diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h index 728c933e3a..acdb05e255 100644 --- a/gtk/gtkbutton.h +++ b/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); }; diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h index 792387ee15..ed3eb54c81 100644 --- a/gtk/gtkcalendar.h +++ b/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 diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h index 686c2bfdbc..ce9085d8b5 100644 --- a/gtk/gtkcellrenderer.h +++ b/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; diff --git a/gtk/gtkcellrendererpixbuf.h b/gtk/gtkcellrendererpixbuf.h index ffdc204880..433bca50bd 100644 --- a/gtk/gtkcellrendererpixbuf.h +++ b/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); diff --git a/gtk/gtkcellrenderertext.h b/gtk/gtkcellrenderertext.h index 0f65c001a8..f25856b4ae 100644 --- a/gtk/gtkcellrenderertext.h +++ b/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); diff --git a/gtk/gtkcellrenderertoggle.h b/gtk/gtkcellrenderertoggle.h index 5f2c3a9d82..87fa1f904e 100644 --- a/gtk/gtkcellrenderertoggle.h +++ b/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); diff --git a/gtk/gtkcheckbutton.h b/gtk/gtkcheckbutton.h index 0f51f7350c..62587f5f53 100644 --- a/gtk/gtkcheckbutton.h +++ b/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); }; diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h index bfa2a090b2..f3ac659f98 100644 --- a/gtk/gtkcheckmenuitem.h +++ b/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); }; diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h index 6de829245f..59397d4701 100644 --- a/gtk/gtkcolorsel.h +++ b/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); }; diff --git a/gtk/gtkcolorseldialog.h b/gtk/gtkcolorseldialog.h index a401c2319d..276df5b2ab 100644 --- a/gtk/gtkcolorseldialog.h +++ b/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); }; diff --git a/gtk/gtkcombo.h b/gtk/gtkcombo.h index 06ac0a26b9..f56acfeb8a 100644 --- a/gtk/gtkcombo.h +++ b/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; diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h index 3b06b78d4c..0fa1b7392a 100644 --- a/gtk/gtkcontainer.h +++ b/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 */ diff --git a/gtk/gtkcurve.h b/gtk/gtkcurve.h index 027a86c5e3..4ffeeab45d 100644 --- a/gtk/gtkcurve.h +++ b/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); }; diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h index 84e85fea53..4dbaac8eb9 100644 --- a/gtk/gtkdialog.h +++ b/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); }; diff --git a/gtk/gtkdrawingarea.h b/gtk/gtkdrawingarea.h index 72e713b4bb..aade1e6d5c 100644 --- a/gtk/gtkdrawingarea.h +++ b/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); }; diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h index 2889d41846..86856c5126 100644 --- a/gtk/gtkentry.h +++ b/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; diff --git a/gtk/gtkfilesel.h b/gtk/gtkfilesel.h index 3aad672fb1..d66d60a09b 100644 --- a/gtk/gtkfilesel.h +++ b/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); }; diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h index 1acadb3b99..7191f75716 100644 --- a/gtk/gtkfontsel.h +++ b/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); }; diff --git a/gtk/gtkgamma.h b/gtk/gtkgamma.h index 931860e6eb..d9733c28dc 100644 --- a/gtk/gtkgamma.h +++ b/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); }; diff --git a/gtk/gtkhandlebox.h b/gtk/gtkhandlebox.h index 41a92af7c0..48176963fc 100644 --- a/gtk/gtkhandlebox.h +++ b/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); }; diff --git a/gtk/gtkiconfactory.h b/gtk/gtkiconfactory.h index 33c965cfcc..53496a9c41 100644 --- a/gtk/gtkiconfactory.h +++ b/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); diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index ddd4ebd449..9f42596ae0 100644 --- a/gtk/gtkimage.h +++ b/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; diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h index ddd4844669..a3ebea0263 100644 --- a/gtk/gtkimcontext.h +++ b/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; diff --git a/gtk/gtkimmulticontext.h b/gtk/gtkimmulticontext.h index faa8b294d5..b20d0e56e6 100644 --- a/gtk/gtkimmulticontext.h +++ b/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; diff --git a/gtk/gtkinputdialog.h b/gtk/gtkinputdialog.h index a661c0b106..ae9ddecc9e 100644 --- a/gtk/gtkinputdialog.h +++ b/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); }; diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h index 27516e493d..d363bb8dd4 100644 --- a/gtk/gtkinvisible.h +++ b/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; diff --git a/gtk/gtkitem.h b/gtk/gtkitem.h index cd02bda168..8fc75950a5 100644 --- a/gtk/gtkitem.h +++ b/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); }; diff --git a/gtk/gtkitemfactory.h b/gtk/gtkitemfactory.h index 56e8fccb3b..d7f0178442 100644 --- a/gtk/gtkitemfactory.h +++ b/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 diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index 9c863a4810..f6376182aa 100644 --- a/gtk/gtklabel.h +++ b/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; diff --git a/gtk/gtklayout.h b/gtk/gtklayout.h index fbefca9b38..d12765008f 100644 --- a/gtk/gtklayout.h +++ b/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; diff --git a/gtk/gtkliststore.h b/gtk/gtkliststore.h index 93ebaf98d6..27014de934 100644 --- a/gtk/gtkliststore.h +++ b/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); }; diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h index cdd858a840..26fed83194 100644 --- a/gtk/gtkmenu.h +++ b/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); }; diff --git a/gtk/gtkmenubar.h b/gtk/gtkmenubar.h index 856ab5b338..8af5b96995 100644 --- a/gtk/gtkmenubar.h +++ b/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); }; diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h index 353a13b1fc..e8e45c550a 100644 --- a/gtk/gtkmenuitem.h +++ b/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); }; diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h index 2d2ca67636..9f90bdd49d 100644 --- a/gtk/gtkmenushell.h +++ b/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); }; diff --git a/gtk/gtkmessagedialog.h b/gtk/gtkmessagedialog.h index 688798c652..d1ac786f24 100644 --- a/gtk/gtkmessagedialog.h +++ b/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); diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h index 8372a244d2..7ed5ed0652 100644 --- a/gtk/gtknotebook.h +++ b/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); }; /*********************************************************** diff --git a/gtk/gtkoptionmenu.h b/gtk/gtkoptionmenu.h index 936eb7d014..cc2e0ffb5e 100644 --- a/gtk/gtkoptionmenu.h +++ b/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); }; diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h index 5940e32ea4..9aafe69d93 100644 --- a/gtk/gtkpaned.h +++ b/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); }; diff --git a/gtk/gtkplug.h b/gtk/gtkplug.h index 4c568e817d..b711c021e8 100644 --- a/gtk/gtkplug.h +++ b/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); }; diff --git a/gtk/gtkprogress.h b/gtk/gtkprogress.h index ef31bb7b6c..47c9632559 100644 --- a/gtk/gtkprogress.h +++ b/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 diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h index a91839a0d6..4945947976 100644 --- a/gtk/gtkprogressbar.h +++ b/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); }; diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h index 81ecb36511..7f331d35b0 100644 --- a/gtk/gtkradiobutton.h +++ b/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); }; diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h index ae09abfe5f..af7aa028fd 100644 --- a/gtk/gtkradiomenuitem.h +++ b/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); }; diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h index f8c0d1e79d..4bfcafbf7f 100644 --- a/gtk/gtkrange.h +++ b/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); }; diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h index c202415d14..5bdf57b38e 100644 --- a/gtk/gtkrc.h +++ b/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); diff --git a/gtk/gtkruler.h b/gtk/gtkruler.h index 1b013b8149..e515890dd2 100644 --- a/gtk/gtkruler.h +++ b/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 diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h index 7bfca7d77e..59b804746a 100644 --- a/gtk/gtkscale.h +++ b/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; diff --git a/gtk/gtkscrollbar.h b/gtk/gtkscrollbar.h index 3aa59538bf..7d4bf231e0 100644 --- a/gtk/gtkscrollbar.h +++ b/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); }; diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h index e0d012a903..498133e4b1 100644 --- a/gtk/gtkscrolledwindow.h +++ b/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); }; diff --git a/gtk/gtksizegroup.h b/gtk/gtksizegroup.h index 5dcb66a75a..1d14f07057 100644 --- a/gtk/gtksizegroup.h +++ b/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); }; /** diff --git a/gtk/gtksocket.h b/gtk/gtksocket.h index 246a70fbba..814bb335d7 100644 --- a/gtk/gtksocket.h +++ b/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); }; diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h index 590402f334..0c23cb28d3 100644 --- a/gtk/gtkspinbutton.h +++ b/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); }; diff --git a/gtk/gtkstatusbar.h b/gtk/gtkstatusbar.h index afad754f6a..ee27022b97 100644 --- a/gtk/gtkstatusbar.h +++ b/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); }; diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h index 9e15db5785..9c3d60384e 100644 --- a/gtk/gtkstyle.h +++ b/gtk/gtkstyle.h @@ -398,7 +398,20 @@ struct _GtkStyleClass gint y, 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 diff --git a/gtk/gtktearoffmenuitem.h b/gtk/gtktearoffmenuitem.h index 45b36fc7b8..e6503ef408 100644 --- a/gtk/gtktearoffmenuitem.h +++ b/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); }; diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h index d2cf2c7448..0a5af63138 100644 --- a/gtk/gtktextbuffer.h +++ b/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; diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h index 1b7bd853c3..de84f7be35 100644 --- a/gtk/gtktextchild.h +++ b/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; diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h index 9418b974d2..c794e3b9b7 100644 --- a/gtk/gtktextlayout.h +++ b/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 diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h index 07ce2672a8..30eb59af2a 100644 --- a/gtk/gtktextmark.h +++ b/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 } diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h index 544c0955dc..03a38a2caf 100644 --- a/gtk/gtktexttag.h +++ b/gtk/gtktexttag.h @@ -76,7 +76,7 @@ struct _GtkTextTag guint pad3 : 1; }; -struct _GtkTextTagClass +struct _GtkTextTagClass { GObjectClass parent_class; @@ -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; diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h index 4e0a4d9f86..deec3820a4 100644 --- a/gtk/gtktexttagtable.h +++ b/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; diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h index c30c54f7b9..5a50518c7e 100644 --- a/gtk/gtktextview.h +++ b/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; diff --git a/gtk/gtktipsquery.h b/gtk/gtktipsquery.h index 03b022d0b4..d7959788e9 100644 --- a/gtk/gtktipsquery.h +++ b/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); }; diff --git a/gtk/gtktogglebutton.h b/gtk/gtktogglebutton.h index 5ebb93c34e..dcf5d8df33 100644 --- a/gtk/gtktogglebutton.h +++ b/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); }; diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index 084ff25563..acc32d5d25 100644 --- a/gtk/gtktoolbar.h +++ b/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); }; diff --git a/gtk/gtktooltips.h b/gtk/gtktooltips.h index b8be5c4be5..49973f6f59 100644 --- a/gtk/gtktooltips.h +++ b/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; diff --git a/gtk/gtktreemodelsort.h b/gtk/gtktreemodelsort.h index e1bfeb35e1..280c3aa1ab 100644 --- a/gtk/gtktreemodelsort.h +++ b/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); }; diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h index 2b8688c1cd..c138c49194 100644 --- a/gtk/gtktreeselection.h +++ b/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); }; diff --git a/gtk/gtktreestore.h b/gtk/gtktreestore.h index e7fdff9a9f..45035d86c6 100644 --- a/gtk/gtktreestore.h +++ b/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); }; diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h index 65c25eef53..c1614d8993 100644 --- a/gtk/gtktreeview.h +++ b/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); }; diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h index 1534683d28..fd1f48c2bb 100644 --- a/gtk/gtktreeviewcolumn.h +++ b/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); diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h index 607aa79293..1be3abb9f6 100644 --- a/gtk/gtkwidget.h +++ b/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 diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h index 393e028495..2aaa13eb97 100644 --- a/gtk/gtkwindow.h +++ b/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;