diff options
60 files changed, 200 insertions, 42 deletions
diff --git a/docs/reference/gdk/tmpl/general.sgml b/docs/reference/gdk/tmpl/general.sgml index dd6ec8dc29..089b44d677 100644 --- a/docs/reference/gdk/tmpl/general.sgml +++ b/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> diff --git a/gtk/gtkaction.h b/gtk/gtkaction.h index 1920c74688..c1212f2fd1 100644 --- a/gtk/gtkaction.h +++ b/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); diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h index 725debdc97..5b9be5cd50 100644 --- a/gtk/gtkbox.h +++ b/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); }; diff --git a/gtk/gtkcalendar.h b/gtk/gtkcalendar.h index df086373f8..33c5a4e4d9 100644 --- a/gtk/gtkcalendar.h +++ b/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); }; diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h index 6ad2b8c7f2..be230ca4af 100644 --- a/gtk/gtkcellrenderer.h +++ b/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; diff --git a/gtk/gtkcellrenderercombo.h b/gtk/gtkcellrenderercombo.h index dc72cc2183..58bdf98338 100644 --- a/gtk/gtkcellrenderercombo.h +++ b/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; diff --git a/gtk/gtkcellrendererspin.h b/gtk/gtkcellrendererspin.h index 3d19b27b64..b942b360f3 100644 --- a/gtk/gtkcellrendererspin.h +++ b/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); diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h index bb94fc2615..93fb4f896f 100644 --- a/gtk/gtkcellview.h +++ b/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; diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h index df59ed6476..f5d64178e8 100644 --- a/gtk/gtkcombobox.h +++ b/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); }; diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h index 57a80aed3c..f469d89eba 100644 --- a/gtk/gtkcontainer.h +++ b/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); }; diff --git a/gtk/gtkcustompaperunixdialog.h b/gtk/gtkcustompaperunixdialog.h index acb31634f7..6779aa8322 100644 --- a/gtk/gtkcustompaperunixdialog.h +++ b/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; diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h index 9dcd3a581e..516b682cb3 100644 --- a/gtk/gtkentry.h +++ b/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; diff --git a/gtk/gtkentrybuffer.h b/gtk/gtkentrybuffer.h index 51725b9720..00e24c32bd 100644 --- a/gtk/gtkentrybuffer.h +++ b/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; diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h index b4fdc5892c..f120c3a679 100644 --- a/gtk/gtkentrycompletion.h +++ b/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 */ diff --git a/gtk/gtkeventbox.h b/gtk/gtkeventbox.h index 079ff48e30..fddd76a2b4 100644 --- a/gtk/gtkeventbox.h +++ b/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; diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h index 496e49f13a..993cf2bee2 100644 --- a/gtk/gtkexpander.h +++ b/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; diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h index c7112a74b6..e469ef7c98 100644 --- a/gtk/gtkfilechooserbutton.h +++ b/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); }; diff --git a/gtk/gtkfilechooserdialog.h b/gtk/gtkfilechooserdialog.h index f10ff9d7aa..5dfdf1fda6 100644 --- a/gtk/gtkfilechooserdialog.h +++ b/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; diff --git a/gtk/gtkfilechooserwidget.h b/gtk/gtkfilechooserwidget.h index 6021517278..c7cea5f115 100644 --- a/gtk/gtkfilechooserwidget.h +++ b/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; diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h index 91ef2f716e..83b1c4ed3b 100644 --- a/gtk/gtkframe.h +++ b/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); }; diff --git a/gtk/gtkiconview.h b/gtk/gtkiconview.h index f46d5331b1..76409fbdf4 100644 --- a/gtk/gtkiconview.h +++ b/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; diff --git a/gtk/gtkimagemenuitem.h b/gtk/gtkimagemenuitem.h index 1904a7b626..25b3033408 100644 --- a/gtk/gtkimagemenuitem.h +++ b/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); }; diff --git a/gtk/gtkinfobar.h b/gtk/gtkinfobar.h index 530ebfb9ce..4a7cf5d83c 100644 --- a/gtk/gtkinfobar.h +++ b/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; diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index 9e76ebd1ea..9085005a15 100644 --- a/gtk/gtklabel.h +++ b/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; diff --git a/gtk/gtklinkbutton.h b/gtk/gtklinkbutton.h index 6e28b302e1..06e361677d 100644 --- a/gtk/gtklinkbutton.h +++ b/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); diff --git a/gtk/gtkmenushell.h b/gtk/gtkmenushell.h index d9b2307b87..ee09a84d53 100644 --- a/gtk/gtkmenushell.h +++ b/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); }; diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h index 93325d111e..e83a7c58a3 100644 --- a/gtk/gtknotebook.h +++ b/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); diff --git a/gtk/gtkoffscreenwindow.h b/gtk/gtkoffscreenwindow.h index 7ecb71262f..e72a29e70d 100644 --- a/gtk/gtkoffscreenwindow.h +++ b/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; diff --git a/gtk/gtkpagesetupunixdialog.h b/gtk/gtkpagesetupunixdialog.h index eb74ecaa28..c53f0ac603 100644 --- a/gtk/gtkpagesetupunixdialog.h +++ b/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; diff --git a/gtk/gtkprinter.h b/gtk/gtkprinter.h index 30bf1d564c..c5bacb35f0 100644 --- a/gtk/gtkprinter.h +++ b/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; diff --git a/gtk/gtkprinteroption.h b/gtk/gtkprinteroption.h index f1831a31c2..50e7ddf324 100644 --- a/gtk/gtkprinteroption.h +++ b/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; diff --git a/gtk/gtkprinteroptionset.h b/gtk/gtkprinteroptionset.h index 1a2cfca8ec..3cacb15d83 100644 --- a/gtk/gtkprinteroptionset.h +++ b/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, diff --git a/gtk/gtkprinteroptionwidget.h b/gtk/gtkprinteroptionwidget.h index 3e08b00dc9..ad35fb9d7c 100644 --- a/gtk/gtkprinteroptionwidget.h +++ b/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; diff --git a/gtk/gtkprintjob.h b/gtk/gtkprintjob.h index e1c5845289..4f3c76181c 100644 --- a/gtk/gtkprintjob.h +++ b/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; diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h index 267a90ca0a..d4ad22530b 100644 --- a/gtk/gtkprintoperation.h +++ b/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 () diff --git a/gtk/gtkprintoperationpreview.h b/gtk/gtkprintoperationpreview.h index 850b0806e0..ca5f5a7b38 100644 --- a/gtk/gtkprintoperationpreview.h +++ b/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; diff --git a/gtk/gtkprintunixdialog.h b/gtk/gtkprintunixdialog.h index c4411a7ae8..0cd410ee6c 100644 --- a/gtk/gtkprintunixdialog.h +++ b/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; diff --git a/gtk/gtkprogressbar.h b/gtk/gtkprogressbar.h index a1913576c2..554d169375 100644 --- a/gtk/gtkprogressbar.h +++ b/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); }; diff --git a/gtk/gtkradiobutton.h b/gtk/gtkradiobutton.h index 20f91cfcdf..b9fd6a43e5 100644 --- a/gtk/gtkradiobutton.h +++ b/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); diff --git a/gtk/gtkradiomenuitem.h b/gtk/gtkradiomenuitem.h index 865ce42c92..315ac021f7 100644 --- a/gtk/gtkradiomenuitem.h +++ b/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); diff --git a/gtk/gtkrange.h b/gtk/gtkrange.h index f2b91b8edc..55f23283e5 100644 --- a/gtk/gtkrange.h +++ b/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); }; diff --git a/gtk/gtkrecentaction.h b/gtk/gtkrecentaction.h index ef4493f866..de99ae1eeb 100644 --- a/gtk/gtkrecentaction.h +++ b/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; diff --git a/gtk/gtkrecentchooserdialog.h b/gtk/gtkrecentchooserdialog.h index a2f9c79ee4..4e8da2cbd8 100644 --- a/gtk/gtkrecentchooserdialog.h +++ b/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); }; diff --git a/gtk/gtkrecentchooserwidget.h b/gtk/gtkrecentchooserwidget.h index 5dc81e2f11..d8b55c9810 100644 --- a/gtk/gtkrecentchooserwidget.h +++ b/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; diff --git a/gtk/gtkscale.h b/gtk/gtkscale.h index 7436b020e7..7da4003e87 100644 --- a/gtk/gtkscale.h +++ b/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; diff --git a/gtk/gtkseparator.h b/gtk/gtkseparator.h index 64096cd3e4..cd7828dd2b 100644 --- a/gtk/gtkseparator.h +++ b/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); }; diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h index 146174bd3d..44751b8de2 100644 --- a/gtk/gtkseparatormenuitem.h +++ b/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); }; diff --git a/gtk/gtkspinbutton.h b/gtk/gtkspinbutton.h index 2e431631cf..d1b1405e4a 100644 --- a/gtk/gtkspinbutton.h +++ b/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); }; diff --git a/gtk/gtkspinner.h b/gtk/gtkspinner.h index 0d9625cb2a..ddf7610333 100644 --- a/gtk/gtkspinner.h +++ b/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; diff --git a/gtk/gtktable.h b/gtk/gtktable.h index b2f807ad90..e0f20c12ff 100644 --- a/gtk/gtktable.h +++ b/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 diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h index e9b6e9716c..5e7d9447b0 100644 --- a/gtk/gtktextbuffer.h +++ b/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; diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h index 1391c1b232..703b0d4d7d 100644 --- a/gtk/gtktextview.h +++ b/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; diff --git a/gtk/gtktoolbar.h b/gtk/gtktoolbar.h index 99a278cfe8..1d15f27a76 100644 --- a/gtk/gtktoolbar.h +++ b/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; diff --git a/gtk/gtktoolitemgroup.h b/gtk/gtktoolitemgroup.h index 82f153ce2e..1024bc046c 100644 --- a/gtk/gtktoolitemgroup.h +++ b/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; diff --git a/gtk/gtktoolpalette.h b/gtk/gtktoolpalette.h index c98dbef685..4a0e9f99f4 100644 --- a/gtk/gtktoolpalette.h +++ b/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; diff --git a/gtk/gtktrayicon.h b/gtk/gtktrayicon.h index 6dc98521fa..a990babf4d 100644 --- a/gtk/gtktrayicon.h +++ b/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; diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h index fcb03e470a..67e34fbb89 100644 --- a/gtk/gtktreemodelfilter.h +++ b/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 */ diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h index e8dbd0c051..8ac2f49e9b 100644 --- a/gtk/gtktreeview.h +++ b/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); }; diff --git a/gtk/gtkuimanager.h b/gtk/gtkuimanager.h index 5500403f44..27cc84f5fc 100644 --- a/gtk/gtkuimanager.h +++ b/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 { diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h index fcbff21dd8..0ceb98724b 100644 --- a/gtk/gtkviewport.h +++ b/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); }; |