docs: add Gtk*Class docs

https://bugzilla.gnome.org/show_bug.cgi?id=81006

64 files changed, 595 insertions, 9 deletions

diff --git a/gtk/deprecated/gtkaction.h b/gtk/deprecated/gtkaction.h
index b78da92a32..a105708d86 100644
--- a/gtk/deprecated/gtkaction.h
+++ b/gtk/deprecated/gtkaction.h
@@ -56,13 +56,22 @@ struct _GtkAction
   GtkActionPrivate *private_data;
 };
 
+/**
+ * GtkActionClass:
+ * @parent_class: The parent class.
+ * @activate: Signal emitted when the action is activated.
+ */
 struct _GtkActionClass
 {
   GObjectClass parent_class;
 
+  /*< public >*/
+
   /* activation signal */
   void       (* activate)           (GtkAction    *action);
 
+  /*< private >*/
+
   GType      menu_item_type;
   GType      toolbar_item_type;
 
diff --git a/gtk/deprecated/gtkactiongroup.h b/gtk/deprecated/gtkactiongroup.h
index e2e54edc51..3ce8f270d3 100644
--- a/gtk/deprecated/gtkactiongroup.h
+++ b/gtk/deprecated/gtkactiongroup.h
@@ -60,6 +60,11 @@ struct _GtkActionGroup
   GtkActionGroupPrivate *priv;
 };
 
+/**
+ * GtkActionGroupClass:
+ * @parent_class: The parent class.
+ * @get_action: Looks up an action in the action group by name.
+ */
 struct _GtkActionGroupClass
 {
   GObjectClass parent_class;
@@ -67,6 +72,8 @@ struct _GtkActionGroupClass
   GtkAction *(* get_action) (GtkActionGroup *action_group,
                              const gchar    *action_name);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/deprecated/gtkcolorsel.h b/gtk/deprecated/gtkcolorsel.h
index f7715d2379..681fe06ad0 100644
--- a/gtk/deprecated/gtkcolorsel.h
+++ b/gtk/deprecated/gtkcolorsel.h
@@ -70,12 +70,19 @@ struct _GtkColorSelection
   GtkColorSelectionPrivate *private_data;
 };
 
+/**
+ * GtkColorSelectionClass:
+ * @parent_class: The parent class.
+ * @color_changed:
+ */
 struct _GtkColorSelectionClass
 {
   GtkBoxClass parent_class;
 
   void (*color_changed)	(GtkColorSelection *color_selection);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/deprecated/gtkhandlebox.h b/gtk/deprecated/gtkhandlebox.h
index 3a635941da..b63476ef9d 100644
--- a/gtk/deprecated/gtkhandlebox.h
+++ b/gtk/deprecated/gtkhandlebox.h
@@ -57,6 +57,14 @@ struct _GtkHandleBox
   GtkHandleBoxPrivate *priv;
 };
 
+/**
+ * GtkHandleBoxClass:
+ * @parent_class: The parent class.
+ * @child_attached: Signal emitted when the contents of the handlebox
+ *    are reattached to the main window. Deprecated: 3.4.
+ * @child_detached: Signal emitted when the contents of the handlebox
+ *    are detached from the main window. Deprecated: 3.4.
+ */
 struct _GtkHandleBoxClass
 {
   GtkBinClass parent_class;
@@ -66,6 +74,8 @@ struct _GtkHandleBoxClass
   void	(*child_detached)	(GtkHandleBox	*handle_box,
 				 GtkWidget	*child);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/deprecated/gtkiconfactory.h b/gtk/deprecated/gtkiconfactory.h
index 779a331f7f..4e47c777a2 100644
--- a/gtk/deprecated/gtkiconfactory.h
+++ b/gtk/deprecated/gtkiconfactory.h
@@ -57,10 +57,16 @@ struct _GtkIconFactory
   GtkIconFactoryPrivate *priv;
 };
 
+/**
+ * GtkIconFactoryClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkIconFactoryClass
 {
   GObjectClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/deprecated/gtkimagemenuitem.h b/gtk/deprecated/gtkimagemenuitem.h
index ec07132ec8..77972c8a67 100644
--- a/gtk/deprecated/gtkimagemenuitem.h
+++ b/gtk/deprecated/gtkimagemenuitem.h
@@ -55,10 +55,16 @@ struct _GtkImageMenuItem
   GtkImageMenuItemPrivate *priv;
 };
 
+/**
+ * GtkImageMenuItemClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkImageMenuItemClass
 {
   GtkMenuItemClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/deprecated/gtkrc.h b/gtk/deprecated/gtkrc.h
index 4fc1505337..c3676973db 100644
--- a/gtk/deprecated/gtkrc.h
+++ b/gtk/deprecated/gtkrc.h
@@ -100,10 +100,21 @@ struct _GtkRcStyle
   guint engine_specified : 1;   /* The RC file specified the engine */
 };
 
+/**
+ * GtkRcStyleClass:
+ * @parent_class: The parent class.
+ * @create_rc_style: 
+ * @parse: 
+ * @merge: 
+ * @create_style: 
+ * @create_style: 
+ */
 struct _GtkRcStyleClass
 {
   GObjectClass parent_class;
 
+  /*< public >*/
+
   /* Create an empty RC style of the same type as this RC style.
    * The default implementation, which does
    * g_object_new (G_OBJECT_TYPE (style), NULL);
@@ -129,6 +140,8 @@ struct _GtkRcStyleClass
    */
   GtkStyle * (*create_style) (GtkRcStyle *rc_style);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/deprecated/gtkstyle.h b/gtk/deprecated/gtkstyle.h
index 755fac0eb5..d5bf9d7b34 100644
--- a/gtk/deprecated/gtkstyle.h
+++ b/gtk/deprecated/gtkstyle.h
@@ -98,10 +98,43 @@ struct _GtkStyle
   GSList         *icon_factories; /* of type GtkIconFactory* */
 };
 
+/**
+ * GtkStyleClass:
+ * @parent_class: The parent class.
+ * @realize: 
+ * @unrealize: 
+ * @copy: 
+ * @clone: 
+ * @init_from_rc: 
+ * @set_background: 
+ * @render_icon: 
+ * @draw_hline: 
+ * @draw_vline: 
+ * @draw_shadow: 
+ * @draw_arrow: 
+ * @draw_diamond: 
+ * @draw_box: 
+ * @draw_flat_box: 
+ * @draw_check: 
+ * @draw_option: 
+ * @draw_tab: 
+ * @draw_shadow_gap: 
+ * @draw_box_gap: 
+ * @draw_extension: 
+ * @draw_focus: 
+ * @draw_slider: 
+ * @draw_handle: 
+ * @draw_expander: 
+ * @draw_layout: 
+ * @draw_resize_grip: 
+ * @draw_spinner: 
+ */
 struct _GtkStyleClass
 {
   GObjectClass parent_class;
 
+  /*< public >*/
+
   /* Initialize for a particular visual. style->visual
    * will have been set at this point. Will typically chain
    * to parent.
@@ -352,6 +385,8 @@ struct _GtkStyleClass
                                  gint                    width,
                                  gint                    height);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1)  (void);
   void (*_gtk_reserved2)  (void);
diff --git a/gtk/deprecated/gtktearoffmenuitem.h b/gtk/deprecated/gtktearoffmenuitem.h
index fafa473e0f..ab8fcf22ad 100644
--- a/gtk/deprecated/gtktearoffmenuitem.h
+++ b/gtk/deprecated/gtktearoffmenuitem.h
@@ -53,10 +53,16 @@ struct _GtkTearoffMenuItem
   GtkTearoffMenuItemPrivate *priv;
 };
 
+/**
+ * GtkTearoffMenuItemClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkTearoffMenuItemClass
 {
   GtkMenuItemClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h
index e31de4f4c0..40d3cec112 100644
--- a/gtk/gtkaccelgroup.h
+++ b/gtk/gtkaccelgroup.h
@@ -88,15 +88,25 @@ struct _GtkAccelGroup
   GtkAccelGroupPrivate *priv;
 };
 
+/**
+ * GtkAccelGroupClass:
+ * @parent_class: The parent class.
+ * @accel_changed: Signal emitted when an entry is added to or removed
+ *    from the accel group.
+ */
 struct _GtkAccelGroupClass
 {
   GObjectClass parent_class;
 
+  /*< public >*/
+
   void	(*accel_changed)	(GtkAccelGroup	*accel_group,
 				 guint           keyval,
 				 GdkModifierType modifier,
 				 GClosure       *accel_closure);
-  
+
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkalignment.h b/gtk/gtkalignment.h
index e4cf345b5d..0f962c97fb 100644
--- a/gtk/gtkalignment.h
+++ b/gtk/gtkalignment.h
@@ -55,10 +55,16 @@ struct _GtkAlignment
   GtkAlignmentPrivate *priv;
 };
 
+/**
+ * GtkAlignmentClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkAlignmentClass
 {
   GtkBinClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkappchooserbutton.h b/gtk/gtkappchooserbutton.h
index 1e9f7755c2..e737e04bb5 100644
--- a/gtk/gtkappchooserbutton.h
+++ b/gtk/gtkappchooserbutton.h
@@ -49,12 +49,23 @@ struct _GtkAppChooserButton {
   GtkAppChooserButtonPrivate *priv;
 };
 
+/**
+ * GtkAppChooserButtonClass:
+ * @parent_class: The parent class.
+ * @custom_item_activated: Signal emitted when a custom item,
+ *    previously added with gtk_app_chooser_button_append_custom_item(),
+ *    is activated from the dropdown menu.
+ */
 struct _GtkAppChooserButtonClass {
   GtkComboBoxClass parent_class;
 
+  /*< public >*/
+
   void (* custom_item_activated) (GtkAppChooserButton *self,
                                   const gchar *item_name);
 
+  /*< private >*/
+
   /* padding for future class expansion */
   gpointer padding[16];
 };
diff --git a/gtk/gtkappchooserdialog.h b/gtk/gtkappchooserdialog.h
index d222298bb6..f2af4954fc 100644
--- a/gtk/gtkappchooserdialog.h
+++ b/gtk/gtkappchooserdialog.h
@@ -52,9 +52,15 @@ struct _GtkAppChooserDialog {
   GtkAppChooserDialogPrivate *priv;
 };
 
+/**
+ * GtkAppChooserDialogClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkAppChooserDialogClass {
   GtkDialogClass parent_class;
 
+  /*< private >*/
+
   /* padding for future class expansion */
   gpointer padding[16];
 };
diff --git a/gtk/gtkappchooserwidget.h b/gtk/gtkappchooserwidget.h
index 27067128e4..19aba13701 100644
--- a/gtk/gtkappchooserwidget.h
+++ b/gtk/gtkappchooserwidget.h
@@ -53,9 +53,21 @@ struct _GtkAppChooserWidget {
   GtkAppChooserWidgetPrivate *priv;
 };
 
+/**
+ * GtkAppChooserWidgetClass:
+ * @parent_class: The parent class.
+ * @application_selected: Signal emitted when an application item is
+ *    selected from the widget's list.
+ * @application_activated: Signal emitted when an application item is
+ *    activated from the widget's list.
+ * @populate_popup: Signal emitted when a context menu is about to
+ *    popup over an application item.
+ */
 struct _GtkAppChooserWidgetClass {
   GtkBoxClass parent_class;
 
+  /*< public >*/
+
   void (* application_selected)  (GtkAppChooserWidget *self,
                                   GAppInfo            *app_info);
 
@@ -66,6 +78,8 @@ struct _GtkAppChooserWidgetClass {
                                   GtkMenu             *menu,
                                   GAppInfo            *app_info);
 
+  /*< private >*/
+
   /* padding for future class expansion */
   gpointer padding[16];
 };
diff --git a/gtk/gtkapplication.h b/gtk/gtkapplication.h
index 2d12039e09..c08f2dc373 100644
--- a/gtk/gtkapplication.h
+++ b/gtk/gtkapplication.h
@@ -48,10 +48,21 @@ struct _GtkApplication
   GtkApplicationPrivate *priv;
 };
 
+/**
+ * GtkApplicationClass:
+ * @parent_class: The parent class.
+ * @window_added: Signal emitted when a #GtkWindow is added to
+ *    application through gtk_application_add_window().
+ * @window_removed: Signal emitted when a #GtkWindow is removed from
+ *    application, either as a side-effect of being destroyed or
+ *    explicitly through gtk_application_remove_window().
+ */
 struct _GtkApplicationClass
 {
   GApplicationClass parent_class;
 
+  /*< public >*/
+
   void (*window_added)   (GtkApplication *application,
                           GtkWindow      *window);
   void (*window_removed) (GtkApplication *application,
diff --git a/gtk/gtkapplicationwindow.h b/gtk/gtkapplicationwindow.h
index 32fd068f98..f0654b3bdc 100644
--- a/gtk/gtkapplicationwindow.h
+++ b/gtk/gtkapplicationwindow.h
@@ -48,6 +48,10 @@ struct _GtkApplicationWindow
   GtkApplicationWindowPrivate *priv;
 };
 
+/**
+ * GtkApplicationWindowClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkApplicationWindowClass
 {
   GtkWindowClass parent_class;
diff --git a/gtk/gtkaspectframe.h b/gtk/gtkaspectframe.h
index 3a54623105..be06f1fb18 100644
--- a/gtk/gtkaspectframe.h
+++ b/gtk/gtkaspectframe.h
@@ -54,10 +54,16 @@ struct _GtkAspectFrame
   GtkAspectFramePrivate *priv;
 };
 
+/**
+ * GtkAspectFrameClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkAspectFrameClass
 {
   GtkFrameClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkassistant.h b/gtk/gtkassistant.h
index ef94067263..c41b02a350 100644
--- a/gtk/gtkassistant.h
+++ b/gtk/gtkassistant.h
@@ -89,15 +89,27 @@ struct _GtkAssistant
   GtkAssistantPrivate *priv;
 };
 
+/**
+ * GtkAssistantClass:
+ * @parent_class: The parent class.
+ * @prepare: Signal emitted when a new page is set as the assistant's current page, before making the new page visible.
+ * @apply: Signal emitted when the apply button is clicked.
+ * @close: Signal emitted either when the close button or last page apply button is clicked.
+ * @cancel: Signal emitted when the cancel button is clicked.
+ */
 struct _GtkAssistantClass
 {
   GtkWindowClass parent_class;
 
+  /*< public >*/
+
   void (* prepare) (GtkAssistant *assistant, GtkWidget *page);
   void (* apply)   (GtkAssistant *assistant);
   void (* close)   (GtkAssistant *assistant);
   void (* cancel)  (GtkAssistant *assistant);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkbbox.h b/gtk/gtkbbox.h
index 36cc39422e..98d55c36bb 100644
--- a/gtk/gtkbbox.h
+++ b/gtk/gtkbbox.h
@@ -54,10 +54,16 @@ struct _GtkButtonBox
   GtkButtonBoxPrivate *priv;
 };
 
+/**
+ * GtkButtonBoxClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkButtonBoxClass
 {
   GtkBoxClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h
index 6f8949ae57..bca7885c5b 100644
--- a/gtk/gtkbin.h
+++ b/gtk/gtkbin.h
@@ -55,10 +55,16 @@ struct _GtkBin
   GtkBinPrivate *priv;
 };
 
+/**
+ * GtkBinClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkBinClass
 {
   GtkContainerClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 9a79fbcd47..bed154794b 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -56,10 +56,16 @@ struct _GtkBox
   GtkBoxPrivate *priv;
 };
 
+/**
+ * GtkBoxClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkBoxClass
 {
   GtkContainerClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index 18379889fa..70ce41e0be 100644
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -55,17 +55,33 @@ struct _GtkButton
   GtkButtonPrivate *priv;
 };
 
+/**
+ * GtkButtonClass:
+ * @parent_class: The parent class.
+ * @pressed: Signal emitted when the button is pressed. Deprecated: 2.8.
+ * @released: Signal emitted when the button is released. Deprecated: 2.8.
+ * @clicked: Signal emitted when the button has been activated (pressed and released).
+ * @enter: Signal emitted when the pointer enters the button. Deprecated: 2.8.
+ * @leave: Signal emitted when the pointer leaves the button. Deprecated: 2.8.
+ * @activate: Signal that causes the button to animate press then
+ *    release. Applications should never connect to this signal, but use
+ *    the @clicked signal.
+ */
 struct _GtkButtonClass
 {
   GtkBinClass        parent_class;
-  
+
+  /*< public >*/
+
   void (* pressed)  (GtkButton *button);
   void (* released) (GtkButton *button);
   void (* clicked)  (GtkButton *button);
   void (* enter)    (GtkButton *button);
   void (* leave)    (GtkButton *button);
   void (* activate) (GtkButton *button);
-  
+
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkcellareabox.h b/gtk/gtkcellareabox.h
index 7339b9fb1a..2784a02ad7 100644
--- a/gtk/gtkcellareabox.h
+++ b/gtk/gtkcellareabox.h
@@ -49,6 +49,9 @@ struct _GtkCellAreaBox
   GtkCellAreaBoxPrivate *priv;
 };
 
+/**
+ * GtkCellAreaBoxClass:
+ */
 struct _GtkCellAreaBoxClass
 {
   /*< private >*/
diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index 59d85251a6..afa45ecf51 100644
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -90,10 +90,29 @@ struct _GtkCellRenderer
   GtkCellRendererPrivate *priv;
 };
 
+/**
+ * GtkCellRendererClass:
+ * @get_request_mode: Called to gets whether the cell renderer prefers
+ *    a height-for-width layout or a width-for-height layout.
+ * @get_preferred_width: Called to get a renderer's natural width.
+ * @get_preferred_height_for_width: Called to get a renderer's natural height for width.
+ * @get_preferred_height: Called to get a renderer's natural height.
+ * @get_preferred_width_for_height: Called to get a renderer's natural width for height.
+ * @get_aligned_area: Called to get the aligned area used by @cell inside @cell_area.
+ * @get_size: Called to get the width and height needed to render the cell. Deprecated: 3.0.
+ * @render: Called to render the content of the #GtkCellRenderer.
+ * @activate: Called to activate the content of the #GtkCellRenderer.
+ * @start_editing: Called to initiate editing the content of the #GtkCellRenderer.
+ * @editing_canceled: Signal gets emitted when the user cancels the process of editing a cell.
+ * @editing_started: Signal gets emitted when a cell starts to be edited.
+ */
 struct _GtkCellRendererClass
 {
+  /*< private >*/
   GInitiallyUnownedClass parent_class;
 
+  /*< public >*/
+
   /* vtable - not signals */
   GtkSizeRequestMode (* get_request_mode)                (GtkCellRenderer      *cell);
   void               (* get_preferred_width)             (GtkCellRenderer      *cell,
@@ -153,6 +172,8 @@ struct _GtkCellRendererClass
 			     GtkCellEditable *editable,
 			     const gchar     *path);
 
+  /*< private >*/
+
   GtkCellRendererClassPrivate *priv;
 
   /* Padding for future expansion */
diff --git a/gtk/gtkcellview.h b/gtk/gtkcellview.h
index 071ca73a1b..af82655545 100644
--- a/gtk/gtkcellview.h
+++ b/gtk/gtkcellview.h
@@ -49,10 +49,16 @@ struct _GtkCellView
   GtkCellViewPrivate *priv;
 };
 
+/**
+ * GtkCellViewClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkCellViewClass
 {
   GtkWidgetClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkcheckmenuitem.h b/gtk/gtkcheckmenuitem.h
index 2e67f7d8e3..f791038055 100644
--- a/gtk/gtkcheckmenuitem.h
+++ b/gtk/gtkcheckmenuitem.h
@@ -55,14 +55,24 @@ struct _GtkCheckMenuItem
   GtkCheckMenuItemPrivate *priv;
 };
 
+/**
+ * GtkCheckMenuItemClass:
+ * @parent_class: The parent class.
+ * @toggled: Signal emitted when the state of the check box is changed.
+ * @draw_indicator: Called to draw the check indicator.
+ */
 struct _GtkCheckMenuItemClass
 {
   GtkMenuItemClass parent_class;
 
+  /*< public >*/
+
   void (* toggled)	  (GtkCheckMenuItem *check_menu_item);
   void (* draw_indicator) (GtkCheckMenuItem *check_menu_item,
 			   cairo_t          *cr);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkcolorchooserwidget.h b/gtk/gtkcolorchooserwidget.h
index f47bc3084b..b47cdd0ad3 100644
--- a/gtk/gtkcolorchooserwidget.h
+++ b/gtk/gtkcolorchooserwidget.h
@@ -45,10 +45,16 @@ struct _GtkColorChooserWidget
   GtkColorChooserWidgetPrivate *priv;
 };
 
+/**
+ * GtkColorChooserWidgetClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkColorChooserWidgetClass
 {
   GtkBoxClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index c3c89196a6..a4277121a2 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -47,15 +47,26 @@ struct _GtkComboBox
   GtkComboBoxPrivate *priv;
 };
 
+/**
+ * GtkComboBoxClass:
+ * @parent_class: The parent class.
+ * @changed: Signal is emitted when the active item is changed.
+ * @format_entry_text: Signal which allows you to change how the text
+ *    displayed in a combo box's entry is displayed.
+ */
 struct _GtkComboBoxClass
 {
   GtkBinClass parent_class;
 
+  /*< public >*/
+
   /* signals */
   void     (* changed)           (GtkComboBox *combo_box);
   gchar   *(* format_entry_text) (GtkComboBox *combo_box,
 				  const gchar *path);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index 0a1f7b68dc..56db9f7687 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -55,10 +55,28 @@ struct _GtkContainer
   GtkContainerPrivate *priv;
 };
 
+/**
+ * GtkContainerClass:
+ * @parent_class: The parent class.
+ * @add: Signal emitted when a widget is added to container.
+ * @remove: Signal emitted when a widget is removed from container.
+ * @check_resize: Signal emitted when a size recalculation is needed.
+ * @forall: Invokes callback on each child of container.
+ * @set_focus_child: Sets the focused child of container.
+ * @child_type: Returns the type of the children supported by the container.
+ * @composite_name: Gets a widget's composite name. Deprecated: 3.10.
+ * @set_child_property: Set a property on a child of container.
+ * @get_path_for_child: Get path representing entire widget hierarchy
+ *    from the toplevel down to and including @child.
+ *
+ * Base class for containers.
+ */
 struct _GtkContainerClass
 {
   GtkWidgetClass parent_class;
 
+  /*< public >*/
+
   void    (*add)       		(GtkContainer	 *container,
 				 GtkWidget	 *widget);
   void    (*remove)    		(GtkContainer	 *container,
diff --git a/gtk/gtkcustompaperunixdialog.h b/gtk/gtkcustompaperunixdialog.h
index 063df8e760..60566b15e8 100644
--- a/gtk/gtkcustompaperunixdialog.h
+++ b/gtk/gtkcustompaperunixdialog.h
@@ -41,10 +41,16 @@ struct _GtkCustomPaperUnixDialog
   GtkCustomPaperUnixDialogPrivate *priv;
 };
 
+/**
+ * GtkCustomPaperUnixDialogClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkCustomPaperUnixDialogClass
 {
   GtkDialogClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index 3761f7dc6c..3e6945bfa9 100644
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -114,16 +114,26 @@ struct _GtkDialog
   GtkDialogPrivate *priv;
 };
 
+/**
+ * GtkDialogClass:
+ * @parent_class: The parent class.
+ * @response: Signal emitted when an action widget is activated.
+ * @close: Signal emitted when the user uses a keybinding to close the dialog.
+ */
 struct _GtkDialogClass
 {
   GtkWindowClass parent_class;
 
+  /*< public >*/
+
   void (* response) (GtkDialog *dialog, gint response_id);
 
   /* Keybinding signals */
 
   void (* close)    (GtkDialog *dialog);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkeventbox.h b/gtk/gtkeventbox.h
index 3548da09ad..3129ae16cc 100644
--- a/gtk/gtkeventbox.h
+++ b/gtk/gtkeventbox.h
@@ -54,10 +54,16 @@ struct _GtkEventBox
   GtkEventBoxPrivate *priv;
 };
 
+/**
+ * GtkEventBoxClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkEventBoxClass
 {
   GtkBinClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkexpander.h b/gtk/gtkexpander.h
index a70f844e4c..085c4480e3 100644
--- a/gtk/gtkexpander.h
+++ b/gtk/gtkexpander.h
@@ -48,15 +48,24 @@ struct _GtkExpander
   GtkExpanderPrivate *priv;
 };
 
+/**
+ * GtkExpanderClass:
+ * @parent_class: The parent class.
+ * @activate: Keybinding signal is emitted when the user hits the Enter key.
+ */
 struct _GtkExpanderClass
 {
   GtkBinClass    parent_class;
 
+  /*< public >*/
+
   /* Key binding signal; to get notification on the expansion
    * state connect to notify:expanded.
    */
   void        (* activate) (GtkExpander *expander);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h
index f8e1606968..9d6ffa6e8c 100644
--- a/gtk/gtkfilechooserbutton.h
+++ b/gtk/gtkfilechooserbutton.h
@@ -47,13 +47,21 @@ struct _GtkFileChooserButton
   GtkFileChooserButtonPrivate *priv;
 };
 
+/**
+ * GtkFileChooserButtonClass:
+ * @parent_class: The parent class.
+ * @file_set: Signal emitted when the user selects a file.
+ */
 struct _GtkFileChooserButtonClass
 {
-  /*< private >*/
   GtkBoxClass parent_class;
 
+  /*< public >*/
+
   void (* file_set) (GtkFileChooserButton *fc);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*__gtk_reserved1);
   void (*__gtk_reserved2);
diff --git a/gtk/gtkfilechooserwidget.h b/gtk/gtkfilechooserwidget.h
index 5d9d89892f..617cfd3e93 100644
--- a/gtk/gtkfilechooserwidget.h
+++ b/gtk/gtkfilechooserwidget.h
@@ -46,10 +46,16 @@ struct _GtkFileChooserWidget
   GtkFileChooserWidgetPrivate *priv;
 };
 
+/**
+ * GtkFileChooserWidgetClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkFileChooserWidgetClass
 {
   GtkBoxClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkfontchooserdialog.h b/gtk/gtkfontchooserdialog.h
index d4a18e5826..c830d36b38 100644
--- a/gtk/gtkfontchooserdialog.h
+++ b/gtk/gtkfontchooserdialog.h
@@ -45,10 +45,16 @@ struct _GtkFontChooserDialog
   GtkFontChooserDialogPrivate *priv;
 };
 
+/**
+ * GtkFontChooserDialogClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkFontChooserDialogClass
 {
   GtkDialogClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkfontchooserwidget.h b/gtk/gtkfontchooserwidget.h
index 662f9326e8..ae4a764adf 100644
--- a/gtk/gtkfontchooserwidget.h
+++ b/gtk/gtkfontchooserwidget.h
@@ -45,10 +45,16 @@ struct _GtkFontChooserWidget
   GtkFontChooserWidgetPrivate *priv;
 };
 
+/**
+ * GtkFontChooserWidgetClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkFontChooserWidgetClass
 {
   GtkBoxClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkframe.h b/gtk/gtkframe.h
index e8ac219f3f..0237da9709 100644
--- a/gtk/gtkframe.h
+++ b/gtk/gtkframe.h
@@ -55,12 +55,21 @@ struct _GtkFrame
   GtkFramePrivate *priv;
 };
 
+/**
+ * GtkFrameClass:
+ * @parent_class: The parent class.
+ * @compute_child_allocation:
+ */
 struct _GtkFrameClass
 {
   GtkBinClass parent_class;
 
+  /*< public >*/
+
   void (*compute_child_allocation) (GtkFrame *frame, GtkAllocation *allocation);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkgrid.h b/gtk/gtkgrid.h
index 4266eda5a9..168face068 100644
--- a/gtk/gtkgrid.h
+++ b/gtk/gtkgrid.h
@@ -49,10 +49,16 @@ struct _GtkGrid
   GtkGridPrivate *priv;
 };
 
+/**
+ * GtkGridClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkGridClass
 {
   GtkContainerClass parent_class;
 
+  /*< private >*/
+
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
diff --git a/gtk/gtkicontheme.h b/gtk/gtkicontheme.h
index b95b03bb07..cb1368af44 100644
--- a/gtk/gtkicontheme.h
+++ b/gtk/gtkicontheme.h
@@ -73,12 +73,23 @@ struct _GtkIconTheme
   GtkIconThemePrivate *priv;
 };
 
+/**
+ * GtkIconThemeClass:
+ * @parent_class: The parent class.
+ * @changed: Signal emitted when the current icon theme is switched or
+ *    GTK+ detects that a change has occurred in the contents of the
+ *    current icon theme.
+ */
 struct _GtkIconThemeClass
 {
   GObjectClass parent_class;
 
+  /*< public >*/
+
   void (* changed)  (GtkIconTheme *icon_theme);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtklistbox.h b/gtk/gtklistbox.h
index 35cdc09a1a..7b2a832032 100644
--- a/gtk/gtklistbox.h
+++ b/gtk/gtklistbox.h
@@ -49,10 +49,21 @@ struct _GtkListBox
   GtkContainer parent_instance;
 };
 
+/**
+ * GtkListBoxClass:
+ * @parent_class: The parent class.
+ * @row_selected: Signal emitted when a new row is selected.
+ * @row_activated: Signal emitted when a row has been activated by the user.
+ * @activate_cursor_row: 
+ * @toggle_cursor_row: 
+ * @move_cursor: 
+ */
 struct _GtkListBoxClass
 {
   GtkContainerClass parent_class;
 
+  /*< public >*/
+
   void (*row_selected)        (GtkListBox      *list_box,
                                GtkListBoxRow   *row);
   void (*row_activated)       (GtkListBox      *list_box,
@@ -63,6 +74,8 @@ struct _GtkListBoxClass
                                GtkMovementStep  step,
                                gint             count);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
@@ -84,12 +97,21 @@ struct _GtkListBoxRow
   GtkBin parent_instance;
 };
 
+/**
+ * GtkListBoxRowClass:
+ * @parent_class: The parent class.
+ * @activate: 
+ */
 struct _GtkListBoxRowClass
 {
   GtkBinClass parent_class;
 
+  /*< public >*/
+
   void (* activate) (GtkListBoxRow *row);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtklockbutton.h b/gtk/gtklockbutton.h
index 1d089733b1..cc7e23013f 100644
--- a/gtk/gtklockbutton.h
+++ b/gtk/gtklockbutton.h
@@ -42,10 +42,16 @@ struct _GtkLockButton
   GtkLockButtonPrivate *priv;
 };
 
+/**
+ * GtkLockButtonClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkLockButtonClass
 {
   GtkButtonClass parent_class;
 
+  /*< private >*/
+
   void (*reserved0) (void);
   void (*reserved1) (void);
   void (*reserved2) (void);
diff --git a/gtk/gtkmenuitem.h b/gtk/gtkmenuitem.h
index 24c87838b0..70dbfd1bc9 100644
--- a/gtk/gtkmenuitem.h
+++ b/gtk/gtkmenuitem.h
@@ -54,10 +54,25 @@ struct _GtkMenuItem
   GtkMenuItemPrivate *priv;
 };
 
+/**
+ * GtkMenuItemClass:
+ * @parent_class: The parent class.
+ * @activate: Signal emitted when the item is activated.
+ * @activate_item: Signal emitted when the item is activated, but also
+ *    if the menu item has a submenu.
+ * @toggle_size_request: 
+ * @toggle_size_allocate: 
+ * @set_label: Sets @text on the #GtkMenuItem label
+ * @get_label: Gets @text from the #GtkMenuItem label
+ * @select: Signal emitted when the item is selected.
+ * @deselect: Signal emitted when the item is deselected.
+ */
 struct _GtkMenuItemClass
 {
   GtkBinClass parent_class;
 
+  /*< public >*/
+
   /* If the following flag is true, then we should always
    * hide the menu when the MenuItem is activated. Otherwise,
    * it is up to the caller. For instance, when navigating
@@ -79,6 +94,8 @@ struct _GtkMenuItemClass
   void (* select)               (GtkMenuItem *menu_item);
   void (* deselect)             (GtkMenuItem *menu_item);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkmenutoolbutton.h b/gtk/gtkmenutoolbutton.h
index 110febcbdd..71a5d64a4c 100644
--- a/gtk/gtkmenutoolbutton.h
+++ b/gtk/gtkmenutoolbutton.h
@@ -48,12 +48,21 @@ struct _GtkMenuToolButton
   GtkMenuToolButtonPrivate *priv;
 };
 
+/**
+ * GtkMenuToolButtonClass:
+ * @parent_class: The parent class.
+ * @show_menu: Signal emitted before the menu is shown.
+ */
 struct _GtkMenuToolButtonClass
 {
   GtkToolButtonClass parent_class;
 
+  /*< public >*/
+
   void (*show_menu) (GtkMenuToolButton *button);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkmountoperation.h b/gtk/gtkmountoperation.h
index 7648300fe5..976cb44bff 100644
--- a/gtk/gtkmountoperation.h
+++ b/gtk/gtkmountoperation.h
@@ -54,10 +54,16 @@ struct _GtkMountOperation
   GtkMountOperationPrivate *priv;
 };
 
+/**
+ * GtkMountOperationClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkMountOperationClass
 {
   GMountOperationClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkoffscreenwindow.h b/gtk/gtkoffscreenwindow.h
index 1fc4782c21..2434558986 100644
--- a/gtk/gtkoffscreenwindow.h
+++ b/gtk/gtkoffscreenwindow.h
@@ -42,10 +42,16 @@ struct _GtkOffscreenWindow
   GtkWindow parent_object;
 };
 
+/**
+ * GtkOffscreenWindowClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkOffscreenWindowClass
 {
   GtkWindowClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkoverlay.h b/gtk/gtkoverlay.h
index 1f8883bc6b..32e3f391d3 100644
--- a/gtk/gtkoverlay.h
+++ b/gtk/gtkoverlay.h
@@ -47,14 +47,24 @@ struct _GtkOverlay
   GtkOverlayPrivate *priv;
 };
 
+/**
+ * GtkOverlayClass:
+ * @parent_class: The parent class.
+ * @get_child_position: Signal emitted to determine the position and
+ *    size of any overlay child widgets.
+ */
 struct _GtkOverlayClass
 {
   GtkBinClass parent_class;
 
+  /*< public >*/
+
   gboolean (*get_child_position) (GtkOverlay    *overlay,
                                   GtkWidget     *widget,
                                   GtkAllocation *allocation);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkpagesetupunixdialog.h b/gtk/gtkpagesetupunixdialog.h
index 8b0748e36d..1bf4c7c41a 100644
--- a/gtk/gtkpagesetupunixdialog.h
+++ b/gtk/gtkpagesetupunixdialog.h
@@ -45,10 +45,16 @@ struct _GtkPageSetupUnixDialog
   GtkPageSetupUnixDialogPrivate *priv;
 };
 
+/**
+ * GtkPageSetupUnixDialogClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkPageSetupUnixDialogClass
 {
   GtkDialogClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index 5269f89438..fdafdac886 100644
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -125,10 +125,34 @@ struct _GtkPrintOperation
   GtkPrintOperationPrivate *priv;
 };
 
+/**
+ * GtkPrintOperationClass:
+ * @parent_class: The parent class.
+ * @done: Signal emitted when the print operation run has finished
+ *    doing everything required for printing.
+ * @begin_print: Signal emitted after the user has finished changing
+ *    print settings in the dialog, before the actual rendering starts.
+ * @paginate: Signal emitted after the "begin-print" signal, but
+ *    before the actual rendering starts.
+ * @request_page_setup: Emitted once for every page that is printed,
+ *    to give the application a chance to modify the page setup.
+ * @draw_page: Signal emitted for every page that is printed.
+ * @end_print: Signal emitted after all pages have been rendered.
+ * @status_changed: Emitted at between the various phases of the print
+ *    operation.
+ * @create_custom_widget: Signal emitted when displaying the print dialog.
+ * @custom_widget_apply: Signal emitted right before "begin-print" if
+ *    you added a custom widget in the "create-custom-widget" handler.
+ * @preview: Signal emitted when a preview is requested from the
+ *    native dialog.
+ * @update_custom_widget: Emitted after change of selected printer.
+ */
 struct _GtkPrintOperationClass
 {
   GObjectClass parent_class;
 
+  /*< public >*/
+
   void     (*done)               (GtkPrintOperation *operation,
                                   GtkPrintOperationResult result);
   void     (*begin_print)        (GtkPrintOperation *operation,
@@ -160,6 +184,8 @@ struct _GtkPrintOperationClass
                                     GtkPageSetup      *setup,
                                     GtkPrintSettings  *settings);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkrevealer.h b/gtk/gtkrevealer.h
index 684e7c59c4..f37a282447 100644
--- a/gtk/gtkrevealer.h
+++ b/gtk/gtkrevealer.h
@@ -50,6 +50,10 @@ struct _GtkRevealer {
   GtkBin parent_instance;
 };
 
+/**
+ * GtkRevealerClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkRevealerClass {
   GtkBinClass parent_class;
 };
diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index be62c8d801..503b3d707e 100644
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -53,12 +53,23 @@ struct _GtkScrolledWindow
   GtkScrolledWindowPrivate *priv;
 };
 
+/**
+ * GtkScrolledWindowClass:
+ * @parent_class: The parent class.
+ * @scrollbar_spacing: 
+ * @scroll_child: Keybinding signal which gets emitted when a
+ *    keybinding that scrolls is pressed.
+ * @move_focus_out: Keybinding signal which gets emitted when focus is
+ *    moved away from the scrolled window by a keybinding.
+ */
 struct _GtkScrolledWindowClass
 {
   GtkBinClass parent_class;
 
   gint scrollbar_spacing;
 
+  /*< public >*/
+
   /* Action signals for keybindings. Do not connect to these signals
    */
 
@@ -73,6 +84,8 @@ struct _GtkScrolledWindowClass
   void (* move_focus_out) (GtkScrolledWindow *scrolled_window,
 			   GtkDirectionType   direction);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtksearchbar.h b/gtk/gtksearchbar.h
index ea3ae851bc..0d8b075b1f 100644
--- a/gtk/gtksearchbar.h
+++ b/gtk/gtksearchbar.h
@@ -52,11 +52,16 @@ struct _GtkSearchBar
   GtkBin parent;
 };
 
+/**
+ * GtkSearchBarClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkSearchBarClass
 {
-  /*< private >*/
   GtkBinClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkseparatormenuitem.h b/gtk/gtkseparatormenuitem.h
index 98e4c562e0..321c5b4727 100644
--- a/gtk/gtkseparatormenuitem.h
+++ b/gtk/gtkseparatormenuitem.h
@@ -51,10 +51,16 @@ struct _GtkSeparatorMenuItem
   GtkMenuItem menu_item;
 };
 
+/**
+ * GtkSeparatorMenuItemClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkSeparatorMenuItemClass
 {
   GtkMenuItemClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkseparatortoolitem.h b/gtk/gtkseparatortoolitem.h
index 5513f835bd..2fff9e4fcd 100644
--- a/gtk/gtkseparatortoolitem.h
+++ b/gtk/gtkseparatortoolitem.h
@@ -47,10 +47,16 @@ struct _GtkSeparatorToolItem
   GtkSeparatorToolItemPrivate *priv;
 };
 
+/**
+ * GtkSeparatorToolItemClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkSeparatorToolItemClass
 {
   GtkToolItemClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (* _gtk_reserved1) (void);
   void (* _gtk_reserved2) (void);
diff --git a/gtk/gtkswitch.h b/gtk/gtkswitch.h
index 539d9e82da..9804f4f474 100644
--- a/gtk/gtkswitch.h
+++ b/gtk/gtkswitch.h
@@ -61,17 +61,19 @@ struct _GtkSwitch
 
 /**
  * GtkSwitchClass:
- *
- * The <structname>GtkSwitchClass</structname> structure contains only
- * private data.
+ * @parent_class: The parent class.
+ * @activate: An action signal and emitting it causes the switch to animate.
  */
 struct _GtkSwitchClass
 {
-  /*< private >*/
   GtkWidgetClass parent_class;
 
+  /*< public >*/
+
   void (* activate) (GtkSwitch *sw);
 
+  /*< private >*/
+
   void (* _switch_padding_1) (void);
   void (* _switch_padding_2) (void);
   void (* _switch_padding_3) (void);
diff --git a/gtk/gtkthemingengine.h b/gtk/gtkthemingengine.h
index f75464a932..a60677497d 100644
--- a/gtk/gtkthemingengine.h
+++ b/gtk/gtkthemingengine.h
@@ -78,6 +78,8 @@ struct _GtkThemingEngineClass
 {
   GObjectClass parent_class;
 
+  /*< public >*/
+
   void (* render_line) (GtkThemingEngine *engine,
                         cairo_t          *cr,
                         gdouble           x0,
diff --git a/gtk/gtktoggletoolbutton.h b/gtk/gtktoggletoolbutton.h
index 975a4c19c3..8fb263ffb3 100644
--- a/gtk/gtktoggletoolbutton.h
+++ b/gtk/gtktoggletoolbutton.h
@@ -48,13 +48,22 @@ struct _GtkToggleToolButton
   GtkToggleToolButtonPrivate *priv;
 };
 
+/**
+ * GtkToggleToolButtonClass:
+ * @parent_class: The parent class.
+ * @toggled: Signal emitted whenever the toggle tool button changes state.
+ */
 struct _GtkToggleToolButtonClass
 {
   GtkToolButtonClass parent_class;
 
+  /*< public >*/
+
   /* signal */
   void (* toggled) (GtkToggleToolButton *button);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (* _gtk_reserved1) (void);
   void (* _gtk_reserved2) (void);
diff --git a/gtk/gtktoolbutton.h b/gtk/gtktoolbutton.h
index 47b4b0a1a0..574c2eb636 100644
--- a/gtk/gtktoolbutton.h
+++ b/gtk/gtktoolbutton.h
@@ -48,15 +48,26 @@ struct _GtkToolButton
   GtkToolButtonPrivate *priv;
 };
 
+/**
+ * GtkToolButtonClass:
+ * @parent_class: The parent class.
+ * @button_type: 
+ * @clicked: Signal emitted when the tool button is clicked with the
+ *    mouse or activated with the keyboard.
+ */
 struct _GtkToolButtonClass
 {
   GtkToolItemClass parent_class;
 
   GType button_type;
 
+  /*< public >*/
+
   /* signal */
   void       (* clicked)             (GtkToolButton    *tool_item);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (* _gtk_reserved1) (void);
   void (* _gtk_reserved2) (void);
diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 376239f169..4f2436472e 100644
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -50,6 +50,15 @@ struct _GtkToolItem
   GtkToolItemPrivate *priv;
 };
 
+/**
+ * GtkToolItemClass:
+ * @parent_class: The parent class.
+ * @create_menu_proxy: Signal emitted when the toolbar needs
+ *    information from tool_item about whether the item should appear in
+ *    the toolbar overflow menu.
+ * @toolbar_reconfigured: Signal emitted when some property of the
+ *    toolbar that the item is a child of changes.
+ */
 struct _GtkToolItemClass
 {
   GtkBinClass parent_class;
@@ -58,6 +67,8 @@ struct _GtkToolItemClass
   gboolean   (* create_menu_proxy)    (GtkToolItem *tool_item);
   void       (* toolbar_reconfigured) (GtkToolItem *tool_item);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (* _gtk_reserved1) (void);
   void (* _gtk_reserved2) (void);
diff --git a/gtk/gtktoolitemgroup.h b/gtk/gtktoolitemgroup.h
index dbe5cf57d1..34bef6503a 100644
--- a/gtk/gtktoolitemgroup.h
+++ b/gtk/gtktoolitemgroup.h
@@ -52,10 +52,16 @@ struct _GtkToolItemGroup
   GtkToolItemGroupPrivate *priv;
 };
 
+/**
+ * GtkToolItemGroupClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkToolItemGroupClass
 {
   GtkContainerClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtktoolpalette.h b/gtk/gtktoolpalette.h
index 721db21f92..8595dba3c0 100644
--- a/gtk/gtktoolpalette.h
+++ b/gtk/gtktoolpalette.h
@@ -67,10 +67,16 @@ struct _GtkToolPalette
   GtkToolPalettePrivate *priv;
 };
 
+/**
+ * GtkToolPaletteClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkToolPaletteClass
 {
   GtkContainerClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index 379961e2c2..be1567f0df 100644
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -80,12 +80,21 @@ struct _GtkTreeSelection
   GtkTreeSelectionPrivate *priv;
 };
 
+/**
+ * GtkTreeSelectionClass:
+ * @parent_class: The parent class.
+ * @changed: Signal emitted whenever the selection has (possibly) changed.
+ */
 struct _GtkTreeSelectionClass
 {
   GObjectClass parent_class;
 
+  /*< public >*/
+
   void (* changed) (GtkTreeSelection *selection);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkviewport.h b/gtk/gtkviewport.h
index af1397f1ff..8b0bef0e18 100644
--- a/gtk/gtkviewport.h
+++ b/gtk/gtkviewport.h
@@ -56,10 +56,16 @@ struct _GtkViewport
   GtkViewportPrivate *priv;
 };
 
+/**
+ * GtkViewportClass:
+ * @parent_class: The parent class.
+ */
 struct _GtkViewportClass
 {
   GtkBinClass parent_class;
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 0be0c9fbc3..426970e597 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -57,10 +57,19 @@ struct _GtkWindow
   GtkWindowPrivate *priv;
 };
 
+/**
+ * GtkWindowClass:
+ * @parent_class: The parent class.
+ * @set_focus: Sets child as the focus widget for the window.
+ * @activate_focus: Activates the current focused widget within the window.
+ * @activate_default: Activates the default widget for the window.
+ */
 struct _GtkWindowClass
 {
   GtkBinClass parent_class;
 
+  /*< public >*/
+
   void     (* set_focus)   (GtkWindow *window,
                             GtkWidget *focus);
 
@@ -70,6 +79,8 @@ struct _GtkWindowClass
   void     (* activate_default) (GtkWindow *window);
   void	   (* keys_changed)     (GtkWindow *window);
 
+  /*< private >*/
+
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);