[vala/staging: 2/14] gtk+-3.0: Add type_ids and abstract annotations for classes



commit 72b0e979d851d4038536f034efd9eb156c2b3fd5
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Wed Aug 20 16:02:29 2014 +0200

    gtk+-3.0: Add type_ids and abstract annotations for classes

 vapi/gtk+-3.0.vapi                          |  500 +++++++++++++-------------
 vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala |    2 +-
 vapi/packages/gtk+-3.0/gtk+-3.0.metadata    |  283 ++++++++++++++--
 3 files changed, 508 insertions(+), 277 deletions(-)
---
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index a24c435..9e39035 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -225,7 +225,7 @@ namespace Gtk {
                [CCode (cheader_filename = "gtk/gtk.h")]
                public static void set_translate_func (string domain, owned Gtk.TranslateFunc func);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_about_dialog_get_type ()")]
        public class AboutDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public AboutDialog ();
@@ -311,7 +311,7 @@ namespace Gtk {
                public weak GLib.Closure closure;
                public Gtk.AccelKey key;
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_accel_label_get_type ()")]
        public class AccelLabel : Gtk.Label, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public AccelLabel (string str);
@@ -326,7 +326,7 @@ namespace Gtk {
                public GLib.Closure accel_closure { owned get; set; }
                public Gtk.Widget accel_widget { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_accel_map_get_type ()")]
        public class AccelMap : GLib.Object {
                [CCode (has_construct_function = false)]
                protected AccelMap ();
@@ -350,7 +350,7 @@ namespace Gtk {
        [Compact]
        public class AccelMapClass {
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_accessible_get_type ()")]
        public class Accessible : Atk.Object {
                [CCode (has_construct_function = false)]
                protected Accessible ();
@@ -364,7 +364,7 @@ namespace Gtk {
                public virtual void widget_unset ();
                public Gtk.Widget widget { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_action_get_type ()")]
        [Deprecated (replacement = "GLib.Action", since = "3.10")]
        public class Action : GLib.Object, Gtk.Buildable {
                [CCode (has_construct_function = false)]
@@ -434,7 +434,7 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void activate ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_action_bar_get_type ()")]
        public class ActionBar : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ActionBar ();
@@ -443,7 +443,7 @@ namespace Gtk {
                public void pack_start (Gtk.Widget child);
                public void set_center_widget (Gtk.Widget? center_widget);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_action_group_get_type ()")]
        [Deprecated (since = "3.10")]
        public class ActionGroup : GLib.Object, Gtk.Buildable {
                [CCode (has_construct_function = false)]
@@ -477,7 +477,7 @@ namespace Gtk {
                public virtual signal void post_activate (Gtk.Action p0);
                public virtual signal void pre_activate (Gtk.Action p0);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_adjustment_get_type ()")]
        public class Adjustment : GLib.InitiallyUnowned {
                [CCode (has_construct_function = false)]
                public Adjustment (double value, double lower, double upper, double step_increment, double 
page_increment, double page_size);
@@ -507,7 +507,7 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void value_changed ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_alignment_get_type ()")]
        public class Alignment : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Alignment (float xalign, float yalign, float xscale, float yscale);
@@ -531,7 +531,7 @@ namespace Gtk {
                [NoAccessorMethod]
                public float yscale { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_app_chooser_button_get_type ()")]
        public class AppChooserButton : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, 
Gtk.CellEditable, Gtk.AppChooser {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public AppChooserButton (string content_type);
@@ -549,7 +549,7 @@ namespace Gtk {
                public bool show_dialog_item { get; set construct; }
                public virtual signal void custom_item_activated (string item_name);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_app_chooser_dialog_get_type ()")]
        public class AppChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.AppChooser {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public AppChooserDialog (Gtk.Window parent, Gtk.DialogFlags flags, GLib.File file);
@@ -562,7 +562,7 @@ namespace Gtk {
                public GLib.File gfile { owned get; construct; }
                public string heading { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_app_chooser_widget_get_type ()")]
        public class AppChooserWidget : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, 
Gtk.AppChooser {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public AppChooserWidget (string content_type);
@@ -588,7 +588,7 @@ namespace Gtk {
                public virtual signal void application_selected (GLib.AppInfo app_info);
                public virtual signal void populate_popup (Gtk.Menu menu, GLib.AppInfo app_info);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_application_get_type ()")]
        public class Application : GLib.Application, GLib.ActionGroup, GLib.ActionMap {
                [CCode (has_construct_function = false)]
                public Application (string application_id, GLib.ApplicationFlags flags);
@@ -623,7 +623,7 @@ namespace Gtk {
                public virtual signal void window_added (Gtk.Window window);
                public virtual signal void window_removed (Gtk.Window window);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_application_window_get_type ()")]
        public class ApplicationWindow : Gtk.Window, Atk.Implementor, Gtk.Buildable, GLib.ActionGroup, 
GLib.ActionMap {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ApplicationWindow (Gtk.Application application);
@@ -632,7 +632,7 @@ namespace Gtk {
                public void set_show_menubar (bool show_menubar);
                public bool show_menubar { get; set construct; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_arrow_get_type ()")]
        public class Arrow : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Arrow (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type);
@@ -642,12 +642,12 @@ namespace Gtk {
                [NoAccessorMethod]
                public Gtk.ShadowType shadow_type { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_arrow_accessible_get_type ()")]
        public class ArrowAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Image {
                [CCode (has_construct_function = false)]
                protected ArrowAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_aspect_frame_get_type ()")]
        public class AspectFrame : Gtk.Frame, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public AspectFrame (string? label, float xalign, float yalign, float ratio, bool obey_child);
@@ -661,7 +661,7 @@ namespace Gtk {
                [NoAccessorMethod]
                public float yalign { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_assistant_get_type ()")]
        public class Assistant : Gtk.Window, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Assistant ();
@@ -701,8 +701,8 @@ namespace Gtk {
                public virtual signal void close ();
                public virtual signal void prepare (Gtk.Widget page);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Bin : Gtk.Container, Atk.Implementor, Gtk.Buildable {
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_bin_get_type ()")]
+       public abstract class Bin : Gtk.Container, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                protected Bin ();
                public unowned Gtk.Widget get_child ();
@@ -749,12 +749,12 @@ namespace Gtk {
                public weak Gtk.BindingSignal next;
                public weak string signal_name;
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_boolean_cell_accessible_get_type ()")]
        public class BooleanCellAccessible : Gtk.RendererCellAccessible, Atk.Action, Atk.Component {
                [CCode (has_construct_function = false)]
                protected BooleanCellAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_box_get_type ()")]
        public class Box : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Box (Gtk.Orientation orientation, int spacing);
@@ -775,7 +775,7 @@ namespace Gtk {
                public bool homogeneous { get; set; }
                public int spacing { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_builder_get_type ()")]
        public class Builder : GLib.Object {
                [CCode (has_construct_function = false)]
                public Builder ();
@@ -809,7 +809,7 @@ namespace Gtk {
                public bool value_from_string_type (GLib.Type type, string str, out GLib.Value value) throws 
GLib.Error;
                public string translation_domain { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_button_get_type ()")]
        public class Button : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Button ();
@@ -868,12 +868,12 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void released ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_button_accessible_get_type ()")]
        public class ButtonAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Action, Atk.Image {
                [CCode (has_construct_function = false)]
                protected ButtonAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_button_box_get_type ()")]
        public class ButtonBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ButtonBox (Gtk.Orientation orientation);
@@ -886,7 +886,7 @@ namespace Gtk {
                [NoAccessorMethod]
                public Gtk.ButtonBoxStyle layout_style { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_calendar_get_type ()")]
        public class Calendar : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Calendar ();
@@ -930,15 +930,15 @@ namespace Gtk {
                public virtual signal void prev_month ();
                public virtual signal void prev_year ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_accessible_get_type ()")]
        public class CellAccessible : Gtk.Accessible, Atk.Action, Atk.Component {
                [CCode (has_construct_function = false)]
                protected CellAccessible ();
                [NoWrapper]
                public virtual void update_cache ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class CellArea : GLib.InitiallyUnowned, Gtk.CellLayout, Gtk.Buildable {
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_area_get_type ()")]
+       public abstract class CellArea : GLib.InitiallyUnowned, Gtk.CellLayout, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                protected CellArea ();
                public virtual bool activate (Gtk.CellAreaContext context, Gtk.Widget widget, Gdk.Rectangle 
cell_area, Gtk.CellRendererState flags, bool edit_only);
@@ -1003,7 +1003,7 @@ namespace Gtk {
                public virtual signal void focus_changed (Gtk.CellRenderer p0, string p1);
                public virtual signal void remove_editable (Gtk.CellRenderer p0, Gtk.CellEditable p1);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_area_box_get_type ()")]
        public class CellAreaBox : Gtk.CellArea, Gtk.CellLayout, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkCellArea*")]
                public CellAreaBox ();
@@ -1011,7 +1011,7 @@ namespace Gtk {
                public void set_spacing (int spacing);
                public int spacing { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_area_context_get_type ()")]
        public class CellAreaContext : GLib.Object {
                [CCode (has_construct_function = false)]
                protected CellAreaContext ();
@@ -1035,7 +1035,7 @@ namespace Gtk {
                [NoAccessorMethod]
                public int natural_width { get; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_renderer_get_type ()")]
        public abstract class CellRenderer : GLib.InitiallyUnowned {
                [CCode (has_construct_function = false)]
                protected CellRenderer ();
@@ -1101,7 +1101,7 @@ namespace Gtk {
                public virtual signal void editing_canceled ();
                public virtual signal void editing_started (Gtk.CellEditable editable, string path);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_renderer_accel_get_type ()")]
        public class CellRendererAccel : Gtk.CellRendererText {
                [CCode (has_construct_function = false, type = "GtkCellRenderer*")]
                public CellRendererAccel ();
@@ -1116,7 +1116,7 @@ namespace Gtk {
                public virtual signal void accel_cleared (string path_string);
                public virtual signal void accel_edited (string path_string, uint accel_key, Gdk.ModifierType 
accel_mods, uint hardware_keycode);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_renderer_combo_get_type ()")]
        public class CellRendererCombo : Gtk.CellRendererText {
                [CCode (has_construct_function = false, type = "GtkCellRenderer*")]
                public CellRendererCombo ();
@@ -1128,7 +1128,7 @@ namespace Gtk {
                public int text_column { get; set; }
                public virtual signal void changed (string p0, Gtk.TreeIter p1);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_renderer_pixbuf_get_type ()")]
        public class CellRendererPixbuf : Gtk.CellRenderer {
                [CCode (has_construct_function = false, type = "GtkCellRenderer*")]
                public CellRendererPixbuf ();
@@ -1153,7 +1153,7 @@ namespace Gtk {
                [NoAccessorMethod]
                public Cairo.Surface surface { owned get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_renderer_progress_get_type ()")]
        public class CellRendererProgress : Gtk.CellRenderer, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkCellRenderer*")]
                public CellRendererProgress ();
@@ -1170,7 +1170,7 @@ namespace Gtk {
                [NoAccessorMethod]
                public int value { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_renderer_spin_get_type ()")]
        public class CellRendererSpin : Gtk.CellRendererText {
                [CCode (has_construct_function = false, type = "GtkCellRenderer*")]
                public CellRendererSpin ();
@@ -1181,7 +1181,7 @@ namespace Gtk {
                [NoAccessorMethod]
                public uint digits { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_renderer_spinner_get_type ()")]
        public class CellRendererSpinner : Gtk.CellRenderer {
                [CCode (has_construct_function = false, type = "GtkCellRenderer*")]
                public CellRendererSpinner ();
@@ -1192,7 +1192,7 @@ namespace Gtk {
                [NoAccessorMethod]
                public Gtk.IconSize size { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_renderer_text_get_type ()")]
        public class CellRendererText : Gtk.CellRenderer {
                [CCode (has_construct_function = false, type = "GtkCellRenderer*")]
                public CellRendererText ();
@@ -1297,7 +1297,7 @@ namespace Gtk {
                public int wrap_width { get; set; }
                public virtual signal void edited (string path, string new_text);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_renderer_toggle_get_type ()")]
        public class CellRendererToggle : Gtk.CellRenderer {
                [CCode (has_construct_function = false, type = "GtkCellRenderer*")]
                public CellRendererToggle ();
@@ -1316,7 +1316,7 @@ namespace Gtk {
                public bool radio { get; set; }
                public virtual signal void toggled (string path);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_view_get_type ()")]
        public class CellView : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public CellView ();
@@ -1357,7 +1357,7 @@ namespace Gtk {
                public bool fit_model { get; set; }
                public Gtk.TreeModel model { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_check_button_get_type ()")]
        public class CheckButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, 
Gtk.Activatable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public CheckButton ();
@@ -1368,7 +1368,7 @@ namespace Gtk {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public CheckButton.with_mnemonic (string label);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_check_menu_item_get_type ()")]
        public class CheckMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, 
Gtk.Actionable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public CheckMenuItem ();
@@ -1390,12 +1390,12 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void toggled ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_check_menu_item_accessible_get_type ()")]
        public class CheckMenuItemAccessible : Gtk.MenuItemAccessible, Atk.Component, Atk.Action, 
Atk.Selection {
                [CCode (has_construct_function = false)]
                protected CheckMenuItemAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_clipboard_get_type ()")]
        public class Clipboard : GLib.Object {
                [CCode (has_construct_function = false)]
                protected Clipboard ();
@@ -1431,7 +1431,7 @@ namespace Gtk {
                public bool wait_is_uris_available ();
                public virtual signal void owner_change (Gdk.Event p0);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_color_button_get_type ()")]
        public class ColorButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, 
Gtk.Activatable, Gtk.ColorChooser {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ColorButton ();
@@ -1455,21 +1455,21 @@ namespace Gtk {
                public bool use_alpha { get; set; }
                public virtual signal void color_set ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_color_chooser_dialog_get_type ()")]
        public class ColorChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.ColorChooser {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ColorChooserDialog (string? title, Gtk.Window? parent);
                [NoAccessorMethod]
                public bool show_editor { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_color_chooser_widget_get_type ()")]
        public class ColorChooserWidget : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, 
Gtk.ColorChooser {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ColorChooserWidget ();
                [NoAccessorMethod]
                public bool show_editor { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_color_selection_get_type ()")]
        public class ColorSelection : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ColorSelection ();
@@ -1502,7 +1502,7 @@ namespace Gtk {
                public bool has_palette { get; set; }
                public virtual signal void color_changed ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_color_selection_dialog_get_type ()")]
        public class ColorSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ColorSelectionDialog (string title);
@@ -1515,7 +1515,7 @@ namespace Gtk {
                [NoAccessorMethod]
                public Gtk.Widget ok_button { owned get; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_combo_box_get_type ()")]
        public class ComboBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.CellEditable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ComboBox ();
@@ -1591,12 +1591,12 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void popup ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_combo_box_accessible_get_type ()")]
        public class ComboBoxAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Action, Atk.Selection {
                [CCode (has_construct_function = false)]
                protected ComboBoxAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_combo_box_text_get_type ()")]
        public class ComboBoxText : Gtk.ComboBox, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, 
Gtk.CellEditable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ComboBoxText ();
@@ -1613,7 +1613,7 @@ namespace Gtk {
                public ComboBoxText.with_entry ();
        }
        [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Container : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
+       public abstract class Container : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                protected Container ();
                public void add_with_properties (Gtk.Widget widget, ...);
@@ -1672,7 +1672,7 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void set_focus_child (Gtk.Widget? child);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_container_accessible_get_type ()")]
        public class ContainerAccessible : Gtk.WidgetAccessible, Atk.Component {
                [CCode (has_construct_function = false)]
                protected ContainerAccessible ();
@@ -1681,7 +1681,7 @@ namespace Gtk {
                [NoWrapper]
                public virtual int remove_gtk (Gtk.Container container, Gtk.Widget widget, void* data);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_container_cell_accessible_get_type ()")]
        public class ContainerCellAccessible : Gtk.CellAccessible, Atk.Action, Atk.Component {
                [CCode (has_construct_function = false)]
                public ContainerCellAccessible ();
@@ -1713,7 +1713,7 @@ namespace Gtk {
                public uint get_start_line ();
                public uint get_start_position ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_dialog_get_type ()")]
        public class Dialog : Gtk.Window, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Dialog ();
@@ -1740,13 +1740,13 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void response (int response_id);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_drawing_area_get_type ()")]
        public class DrawingArea : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
                public void* dummy;
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public DrawingArea ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_entry_get_type ()")]
        public class Entry : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Entry ();
@@ -1923,12 +1923,12 @@ namespace Gtk {
                public virtual signal void preedit_changed (string p0);
                public virtual signal void toggle_overwrite ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_entry_accessible_get_type ()")]
        public class EntryAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.EditableText, Atk.Text, 
Atk.Action {
                [CCode (has_construct_function = false)]
                protected EntryAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_entry_buffer_get_type ()")]
        public class EntryBuffer : GLib.Object {
                [CCode (has_construct_function = false)]
                public EntryBuffer (uint8[] initial_chars);
@@ -1948,7 +1948,7 @@ namespace Gtk {
                public virtual signal void deleted_text (uint position, uint n_chars);
                public virtual signal void inserted_text (uint position, string chars, uint n_chars);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_entry_completion_get_type ()")]
        public class EntryCompletion : GLib.Object, Gtk.CellLayout, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                public EntryCompletion ();
@@ -1995,12 +1995,12 @@ namespace Gtk {
                public virtual signal bool match_selected (Gtk.TreeModel model, Gtk.TreeIter iter);
                public virtual signal void no_matches ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_entry_icon_accessible_get_type ()")]
        public class EntryIconAccessible : Atk.Object, Atk.Action, Atk.Component {
                [CCode (has_construct_function = false)]
                protected EntryIconAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_event_box_get_type ()")]
        public class EventBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public EventBox ();
@@ -2011,8 +2011,8 @@ namespace Gtk {
                public bool above_child { get; set; }
                public bool visible_window { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class EventController : GLib.Object {
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_event_controller_get_type ()")]
+       public abstract class EventController : GLib.Object {
                [CCode (has_construct_function = false)]
                protected EventController ();
                public Gtk.PropagationPhase get_propagation_phase ();
@@ -2023,7 +2023,7 @@ namespace Gtk {
                public Gtk.PropagationPhase propagation_phase { get; set; }
                public Gtk.Widget widget { get; construct; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_expander_get_type ()")]
        public class Expander : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Expander (string label);
@@ -2055,12 +2055,12 @@ namespace Gtk {
                public bool use_underline { get; set construct; }
                public virtual signal void activate ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_expander_accessible_get_type ()")]
        public class ExpanderAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Action {
                [CCode (has_construct_function = false)]
                protected ExpanderAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_file_chooser_button_get_type ()")]
        public class FileChooserButton : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, 
Gtk.FileChooser {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public FileChooserButton (string title, Gtk.FileChooserAction action);
@@ -2078,12 +2078,12 @@ namespace Gtk {
                public int width_chars { get; set; }
                public virtual signal void file_set ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_file_chooser_dialog_get_type ()")]
        public class FileChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.FileChooser {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public FileChooserDialog (string? title, Gtk.Window? parent, Gtk.FileChooserAction action, 
...);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_file_chooser_widget_get_type ()")]
        public class FileChooserWidget : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, 
Gtk.FileChooser, Gtk.FileChooserEmbed {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public FileChooserWidget (Gtk.FileChooserAction action);
@@ -2099,7 +2099,7 @@ namespace Gtk {
                public virtual signal void show_hidden ();
                public virtual signal void up_folder ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_file_filter_get_type ()")]
        public class FileFilter : GLib.InitiallyUnowned, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                public FileFilter ();
@@ -2123,7 +2123,7 @@ namespace Gtk {
                public weak string mime_type;
                public weak string uri;
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_fixed_get_type ()")]
        public class Fixed : Gtk.Container, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Fixed ();
@@ -2137,7 +2137,7 @@ namespace Gtk {
                public int x;
                public int y;
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_flow_box_get_type ()")]
        public class FlowBox : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public FlowBox ();
@@ -2184,12 +2184,12 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void unselect_all ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_flow_box_accessible_get_type ()")]
        public class FlowBoxAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Selection {
                [CCode (has_construct_function = false)]
                protected FlowBoxAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_flow_box_child_get_type ()")]
        public class FlowBoxChild : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public FlowBoxChild ();
@@ -2198,12 +2198,12 @@ namespace Gtk {
                public bool is_selected ();
                public virtual signal void activate ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_flow_box_child_accessible_get_type ()")]
        public class FlowBoxChildAccessible : Gtk.ContainerAccessible, Atk.Component {
                [CCode (has_construct_function = false)]
                protected FlowBoxChildAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_font_button_get_type ()")]
        public class FontButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, 
Gtk.Activatable, Gtk.FontChooser {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public FontButton ();
@@ -2229,17 +2229,17 @@ namespace Gtk {
                public bool use_size { get; set; }
                public virtual signal void font_set ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_font_chooser_dialog_get_type ()")]
        public class FontChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.FontChooser {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public FontChooserDialog (string? title, Gtk.Window? parent);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_font_chooser_widget_get_type ()")]
        public class FontChooserWidget : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, 
Gtk.FontChooser {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public FontChooserWidget ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_font_selection_get_type ()")]
        public class FontSelection : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public FontSelection ();
@@ -2258,7 +2258,7 @@ namespace Gtk {
                public string font_name { owned get; set; }
                public string preview_text { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_font_selection_dialog_get_type ()")]
        [Deprecated (replacement = "FontChooserDialog", since = "3.2")]
        public class FontSelectionDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
@@ -2271,7 +2271,7 @@ namespace Gtk {
                public bool set_font_name (string fontname);
                public void set_preview_text (string text);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_frame_get_type ()")]
        public class Frame : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Frame (string? label);
@@ -2293,13 +2293,13 @@ namespace Gtk {
                public float label_yalign { get; set; }
                public Gtk.ShadowType shadow_type { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_frame_accessible_get_type ()")]
        public class FrameAccessible : Gtk.ContainerAccessible, Atk.Component {
                [CCode (has_construct_function = false)]
                protected FrameAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Gesture : Gtk.EventController {
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_gesture_get_type ()")]
+       public abstract class Gesture : Gtk.EventController {
                [CCode (has_construct_function = false)]
                protected Gesture ();
                public bool get_bounding_box (out Gdk.Rectangle rect);
@@ -2330,7 +2330,7 @@ namespace Gtk {
                public virtual signal void sequence_state_changed (Gdk.EventSequence p0, 
Gtk.EventSequenceState p1);
                public virtual signal void update (Gdk.EventSequence p0);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_gesture_drag_get_type ()")]
        public class GestureDrag : Gtk.GestureSingle {
                [CCode (has_construct_function = false, type = "GtkGesture*")]
                public GestureDrag (Gtk.Widget widget);
@@ -2340,14 +2340,14 @@ namespace Gtk {
                public virtual signal void drag_end (double p0, double p1);
                public virtual signal void drag_update (double p0, double p1);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_gesture_long_press_get_type ()")]
        public class GestureLongPress : Gtk.GestureSingle {
                [CCode (has_construct_function = false, type = "GtkGesture*")]
                public GestureLongPress (Gtk.Widget widget);
                public virtual signal void cancelled ();
                public virtual signal void pressed (double p0, double p1);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_gesture_multi_press_get_type ()")]
        public class GestureMultiPress : Gtk.GestureSingle {
                [CCode (has_construct_function = false, type = "GtkGesture*")]
                public GestureMultiPress (Gtk.Widget widget);
@@ -2357,7 +2357,7 @@ namespace Gtk {
                public virtual signal void released (int p0, double p1, double p2);
                public virtual signal void stopped ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_gesture_pan_get_type ()")]
        public class GesturePan : Gtk.GestureDrag {
                [CCode (has_construct_function = false, type = "GtkGesture*")]
                public GesturePan (Gtk.Widget widget, Gtk.Orientation orientation);
@@ -2366,14 +2366,14 @@ namespace Gtk {
                public Gtk.Orientation orientation { get; set; }
                public virtual signal void pan (Gtk.PanDirection p0, double p1);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_gesture_rotate_get_type ()")]
        public class GestureRotate : Gtk.Gesture {
                [CCode (has_construct_function = false, type = "GtkGesture*")]
                public GestureRotate (Gtk.Widget widget);
                public double get_angle_delta ();
                public virtual signal void angle_changed (double p0, double p1);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_gesture_single_get_type ()")]
        public class GestureSingle : Gtk.Gesture {
                [CCode (has_construct_function = false)]
                protected GestureSingle ();
@@ -2389,14 +2389,14 @@ namespace Gtk {
                public bool exclusive { get; set; }
                public bool touch_only { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_gesture_swipe_get_type ()")]
        public class GestureSwipe : Gtk.GestureSingle {
                [CCode (has_construct_function = false, type = "GtkGesture*")]
                public GestureSwipe (Gtk.Widget widget);
                public bool get_velocity (out double velocity_x, out double velocity_y);
                public virtual signal void swipe (double p0, double p1);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_gesture_zoom_get_type ()")]
        public class GestureZoom : Gtk.Gesture {
                [CCode (has_construct_function = false, type = "GtkGesture*")]
                public GestureZoom (Gtk.Widget widget);
@@ -2415,7 +2415,7 @@ namespace Gtk {
                public Cairo.Pattern resolve_for_context (Gtk.StyleContext context);
                public string to_string ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_grid_get_type ()")]
        public class Grid : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Grid ();
@@ -2445,24 +2445,24 @@ namespace Gtk {
                public bool row_homogeneous { get; set; }
                public int row_spacing { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_hbox_get_type ()")]
        [Deprecated (replacement = "Grid", since = "3.2")]
        public class HBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public HBox (bool homogeneous, int spacing);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_hbutton_box_get_type ()")]
        public class HButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public HButtonBox ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_hpaned_get_type ()")]
        [Deprecated (replacement = "Paned", since = "3.2")]
        public class HPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public HPaned ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_hsv_get_type ()")]
        public class HSV : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public HSV ();
@@ -2475,7 +2475,7 @@ namespace Gtk {
                public virtual signal void changed ();
                public virtual signal void move (Gtk.DirectionType type);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_hscale_get_type ()")]
        [Deprecated (since = "3.2")]
        public class HScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
@@ -2483,19 +2483,19 @@ namespace Gtk {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public HScale.with_range (double min, double max, double step);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_hscrollbar_get_type ()")]
        [Deprecated (since = "3.2")]
        public class HScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public HScrollbar (Gtk.Adjustment? adjustment);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_hseparator_get_type ()")]
        [Deprecated (replacement = "Separator", since = "3.2")]
        public class HSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public HSeparator ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_handle_box_get_type ()")]
        [Deprecated (since = "3.4")]
        public class HandleBox : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
@@ -2515,7 +2515,7 @@ namespace Gtk {
                public bool snap_edge_set { get; set; }
                public virtual signal void child_attached (Gtk.Widget child);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_header_bar_get_type ()")]
        public class HeaderBar : Gtk.Container, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public HeaderBar ();
@@ -2544,8 +2544,8 @@ namespace Gtk {
                public string subtitle { get; set; }
                public string title { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h,gtk/gtkimmodule.h")]
-       public class IMContext : GLib.Object {
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_im_context_get_type ()")]
+       public abstract class IMContext : GLib.Object {
                [CCode (has_construct_function = false)]
                protected IMContext ();
                public virtual bool filter_keypress (Gdk.EventKey event);
@@ -2570,13 +2570,13 @@ namespace Gtk {
                public virtual signal void preedit_start ();
                public virtual signal bool retrieve_surrounding ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_im_context_simple_get_type ()")]
        public class IMContextSimple : Gtk.IMContext {
                [CCode (has_construct_function = false, type = "GtkIMContext*")]
                public IMContextSimple ();
                public void add_table ([CCode (array_length = false)] uint16[] data, int max_seq_len, int 
n_seqs);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_im_multicontext_get_type ()")]
        public class IMMulticontext : Gtk.IMContext {
                [CCode (has_construct_function = false, type = "GtkIMContext*")]
                public IMMulticontext ();
@@ -2584,7 +2584,7 @@ namespace Gtk {
                public unowned string get_context_id ();
                public void set_context_id (string context_id);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_icon_factory_get_type ()")]
        [Deprecated (replacement = "Gtk.IconTheme", since = "3.10")]
        public class IconFactory : GLib.Object, Gtk.Buildable {
                [CCode (has_construct_function = false)]
@@ -2595,7 +2595,7 @@ namespace Gtk {
                public static unowned Gtk.IconSet lookup_default (string stock_id);
                public void remove_default ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_info_copy", free_function = 
"gtk_icon_info_free")]
+       [CCode (cheader_filename = "gtk/gtk.h", copy_function = "gtk_icon_info_copy", free_function = 
"gtk_icon_info_free", type_id = "gtk_icon_info_get_type ()")]
        [Compact]
        public class IconInfo {
                [CCode (has_construct_function = false)]
@@ -2671,7 +2671,7 @@ namespace Gtk {
                public void set_state (Gtk.StateType state);
                public void set_state_wildcarded (bool setting);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_icon_theme_get_type ()")]
        public class IconTheme : GLib.Object {
                [CCode (has_construct_function = false)]
                public IconTheme ();
@@ -2704,7 +2704,7 @@ namespace Gtk {
                public void set_search_path (string[] path);
                public virtual signal void changed ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_icon_view_get_type ()")]
        public class IconView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.CellLayout, Gtk.Scrollable 
{
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public IconView ();
@@ -2798,12 +2798,12 @@ namespace Gtk {
                public virtual signal void toggle_cursor_item ();
                public virtual signal void unselect_all ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_icon_view_accessible_get_type ()")]
        public class IconViewAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Selection {
                [CCode (has_construct_function = false)]
                protected IconViewAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_image_get_type ()")]
        public class Image : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Image ();
@@ -2869,17 +2869,17 @@ namespace Gtk {
                [NoAccessorMethod]
                public bool use_fallback { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_image_accessible_get_type ()")]
        public class ImageAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Image {
                [CCode (has_construct_function = false)]
                protected ImageAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_image_cell_accessible_get_type ()")]
        public class ImageCellAccessible : Gtk.RendererCellAccessible, Atk.Action, Atk.Component, Atk.Image {
                [CCode (has_construct_function = false)]
                protected ImageCellAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_image_menu_item_get_type ()")]
        public class ImageMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, 
Gtk.Actionable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ImageMenuItem ();
@@ -2901,7 +2901,7 @@ namespace Gtk {
                public Gtk.Widget image { get; set; }
                public bool use_stock { get; set construct; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_info_bar_get_type ()")]
        public class InfoBar : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public InfoBar ();
@@ -2924,7 +2924,7 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void response (int response_id);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_invisible_get_type ()")]
        public class Invisible : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Invisible ();
@@ -2934,7 +2934,7 @@ namespace Gtk {
                public void set_screen (Gdk.Screen screen);
                public Gdk.Screen screen { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_label_get_type ()")]
        public class Label : Gtk.Misc, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Label (string? str);
@@ -3014,7 +3014,7 @@ namespace Gtk {
                public virtual signal void move_cursor (Gtk.MovementStep step, int count, bool 
extend_selection);
                public virtual signal void populate_popup (Gtk.Menu menu);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_label_accessible_get_type ()")]
        public class LabelAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Text, Atk.Hypertext {
                [CCode (has_construct_function = false)]
                protected LabelAccessible ();
@@ -3023,7 +3023,7 @@ namespace Gtk {
        [Compact]
        public class LabelSelectionInfo {
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_layout_get_type ()")]
        public class Layout : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Layout (Gtk.Adjustment? hadjustment = null, Gtk.Adjustment? vadjustment = null);
@@ -3041,7 +3041,7 @@ namespace Gtk {
                [NoAccessorMethod]
                public uint width { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_level_bar_get_type ()")]
        public class LevelBar : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public LevelBar ();
@@ -3067,12 +3067,12 @@ namespace Gtk {
                public double value { get; set; }
                public virtual signal void offset_changed (string name);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_level_bar_accessible_get_type ()")]
        public class LevelBarAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Value {
                [CCode (has_construct_function = false)]
                protected LevelBarAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_link_button_get_type ()")]
        public class LinkButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable 
{
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public LinkButton (string uri);
@@ -3086,12 +3086,12 @@ namespace Gtk {
                public bool visited { get; set; }
                public virtual signal bool activate_link ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_link_button_accessible_get_type ()")]
        public class LinkButtonAccessible : Gtk.ButtonAccessible, Atk.Component, Atk.Action, Atk.Image, 
Atk.HyperlinkImpl {
                [CCode (has_construct_function = false)]
                protected LinkButtonAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_list_box_get_type ()")]
        public class ListBox : Gtk.Container, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ListBox ();
@@ -3132,12 +3132,12 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void unselect_all ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_list_box_accessible_get_type ()")]
        public class ListBoxAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Selection {
                [CCode (has_construct_function = false)]
                protected ListBoxAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_list_box_row_get_type ()")]
        public class ListBoxRow : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ListBoxRow ();
@@ -3154,12 +3154,12 @@ namespace Gtk {
                public bool selectable { get; set; }
                public virtual signal void activate ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_list_box_row_accessible_get_type ()")]
        public class ListBoxRowAccessible : Gtk.ContainerAccessible, Atk.Component {
                [CCode (has_construct_function = false)]
                protected ListBoxRowAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_list_store_get_type ()")]
        public class ListStore : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource, Gtk.TreeDragDest, 
Gtk.TreeSortable, Gtk.Buildable {
                [CCode (has_construct_function = false, sentinel = "-1")]
                public ListStore (int n_columns, ...);
@@ -3187,7 +3187,7 @@ namespace Gtk {
                public void set_valuesv (Gtk.TreeIter iter, [CCode (array_length_pos = 3.1)] int[] columns, 
[CCode (array_length_pos = 3.1)] GLib.Value[] values);
                public void swap (Gtk.TreeIter a, Gtk.TreeIter b);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_lock_button_get_type ()")]
        public class LockButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable 
{
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public LockButton (GLib.Permission permission);
@@ -3221,12 +3221,12 @@ namespace Gtk {
                [NoAccessorMethod]
                public string tooltip_unlock { owned get; set construct; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_lock_button_accessible_get_type ()")]
        public class LockButtonAccessible : Gtk.ButtonAccessible, Atk.Component, Atk.Action, Atk.Image {
                [CCode (has_construct_function = false)]
                protected LockButtonAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_menu_get_type ()")]
        public class Menu : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Menu ();
@@ -3269,12 +3269,12 @@ namespace Gtk {
                public string tearoff_title { owned get; set; }
                public virtual signal void move_scroll (Gtk.ScrollType p0);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_menu_accessible_get_type ()")]
        public class MenuAccessible : Gtk.MenuShellAccessible, Atk.Component, Atk.Selection {
                [CCode (has_construct_function = false)]
                protected MenuAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_menu_bar_get_type ()")]
        public class MenuBar : Gtk.MenuShell, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public MenuBar ();
@@ -3287,7 +3287,7 @@ namespace Gtk {
                public Gtk.PackDirection child_pack_direction { get; set; }
                public Gtk.PackDirection pack_direction { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_menu_button_get_type ()")]
        public class MenuButton : Gtk.ToggleButton, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, 
Gtk.Activatable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public MenuButton ();
@@ -3310,12 +3310,12 @@ namespace Gtk {
                public Gtk.Menu popup { get; set; }
                public bool use_popover { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_menu_button_accessible_get_type ()")]
        public class MenuButtonAccessible : Gtk.ToggleButtonAccessible, Atk.Component, Atk.Action, Atk.Image {
                [CCode (has_construct_function = false)]
                protected MenuButtonAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_menu_item_get_type ()")]
        public class MenuItem : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, Gtk.Actionable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public MenuItem ();
@@ -3352,12 +3352,12 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void toggle_size_request (void* requisition);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_menu_item_accessible_get_type ()")]
        public class MenuItemAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Action, Atk.Selection {
                [CCode (has_construct_function = false)]
                protected MenuItemAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_menu_shell_get_type ()")]
        public abstract class MenuShell : Gtk.Container, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                protected MenuShell ();
@@ -3387,12 +3387,12 @@ namespace Gtk {
                public virtual signal bool move_selected (int distance);
                public virtual signal void selection_done ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_menu_shell_accessible_get_type ()")]
        public class MenuShellAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Selection {
                [CCode (has_construct_function = false)]
                protected MenuShellAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_menu_tool_button_get_type ()")]
        public class MenuToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, 
Gtk.Actionable {
                [CCode (has_construct_function = false, type = "GtkToolItem*")]
                public MenuToolButton (Gtk.Widget? icon_widget, string? label);
@@ -3405,7 +3405,7 @@ namespace Gtk {
                public Gtk.Menu menu { get; set; }
                public virtual signal void show_menu ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_message_dialog_get_type ()")]
        public class MessageDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                [PrintfFormat]
@@ -3436,8 +3436,8 @@ namespace Gtk {
                [NoAccessorMethod]
                public bool use_markup { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Misc : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_misc_get_type ()")]
+       public abstract class Misc : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                protected Misc ();
                public void get_alignment (out float xalign, out float yalign);
@@ -3453,7 +3453,7 @@ namespace Gtk {
                [NoAccessorMethod]
                public int ypad { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_mount_operation_get_type ()")]
        public class MountOperation : GLib.MountOperation {
                [CCode (has_construct_function = false, type = "GMountOperation*")]
                public MountOperation (Gtk.Window? parent);
@@ -3536,18 +3536,18 @@ namespace Gtk {
                public virtual signal bool select_page (bool move_focus);
                public virtual signal void switch_page (Gtk.Widget page, uint page_num);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_notebook_accessible_get_type ()")]
        public class NotebookAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Selection {
                [CCode (has_construct_function = false)]
                protected NotebookAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_notebook_page_accessible_get_type ()")]
        public class NotebookPageAccessible : Atk.Object, Atk.Component {
                [CCode (has_construct_function = false, type = "AtkObject*")]
                public NotebookPageAccessible (Gtk.NotebookAccessible notebook, Gtk.Widget child);
                public void invalidate ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_numerable_icon_get_type ()")]
        public class NumerableIcon : GLib.EmblemedIcon, GLib.Icon {
                [CCode (has_construct_function = false, type = "GIcon*")]
                public NumerableIcon (GLib.Icon base_icon);
@@ -3570,14 +3570,14 @@ namespace Gtk {
                public string label { get; set; }
                public Gtk.StyleContext style_context { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_offscreen_window_get_type ()")]
        public class OffscreenWindow : Gtk.Window, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public OffscreenWindow ();
                public Gdk.Pixbuf get_pixbuf ();
                public unowned Cairo.Surface get_surface ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_overlay_get_type ()")]
        public class Overlay : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Overlay ();
@@ -3590,7 +3590,7 @@ namespace Gtk {
                public int end;
                public int start;
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_page_setup_get_type ()")]
        public class PageSetup : GLib.Object {
                [CCode (has_construct_function = false)]
                public PageSetup ();
@@ -3621,7 +3621,7 @@ namespace Gtk {
                public bool to_file (string file_name) throws GLib.Error;
                public void to_key_file (GLib.KeyFile key_file, string group_name);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_paned_get_type ()")]
        public class Paned : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Paned (Gtk.Orientation orientation);
@@ -3648,7 +3648,7 @@ namespace Gtk {
                public virtual signal bool move_handle (Gtk.ScrollType scroll);
                public virtual signal bool toggle_handle_focus ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_paned_accessible_get_type ()")]
        public class PanedAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Value {
                [CCode (has_construct_function = false)]
                protected PanedAccessible ();
@@ -3681,7 +3681,7 @@ namespace Gtk {
                public void set_size (double width, double height, Gtk.Unit unit);
                public void to_key_file (GLib.KeyFile key_file, string group_name);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_places_sidebar_get_type ()")]
        public class PlacesSidebar : Gtk.ScrolledWindow, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public PlacesSidebar ();
@@ -3714,7 +3714,7 @@ namespace Gtk {
                public virtual signal void populate_popup (Gtk.Menu p0, GLib.File? p1, GLib.Volume? p2);
                public virtual signal void show_error_message (string p0, string p1);
        }
-       [CCode (cheader_filename = "gtk/gtkx.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_plug_get_type ()")]
        public class Plug : Gtk.Window, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Plug (X.Window socket_id);
@@ -3728,7 +3728,7 @@ namespace Gtk {
                public bool embedded { get; }
                public Gdk.Window socket_window { get; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_popover_get_type ()")]
        public class Popover : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Popover (Gtk.Widget relative_to);
@@ -3749,12 +3749,12 @@ namespace Gtk {
                public Gtk.Widget relative_to { get; set; }
                public virtual signal void closed ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_popover_accessible_get_type ()")]
        public class PopoverAccessible : Gtk.ContainerAccessible, Atk.Component {
                [CCode (has_construct_function = false)]
                protected PopoverAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_print_context_get_type ()")]
        public class PrintContext : GLib.Object {
                [CCode (has_construct_function = false)]
                protected PrintContext ();
@@ -3770,7 +3770,7 @@ namespace Gtk {
                public double get_width ();
                public void set_cairo_context (Cairo.Context cr, double dpi_x, double dpi_y);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_print_operation_get_type ()")]
        public class PrintOperation : GLib.Object, Gtk.PrintOperationPreview {
                [CCode (has_construct_function = false)]
                public PrintOperation ();
@@ -3843,7 +3843,7 @@ namespace Gtk {
                public virtual signal void status_changed ();
                public virtual signal void update_custom_widget (Gtk.Widget widget, Gtk.PageSetup setup, 
Gtk.PrintSettings settings);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_print_settings_get_type ()")]
        public class PrintSettings : GLib.Object {
                [CCode (has_construct_function = false)]
                public PrintSettings ();
@@ -3923,7 +3923,7 @@ namespace Gtk {
                public void to_key_file (GLib.KeyFile key_file, string group_name);
                public void unset (string key);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_progress_bar_get_type ()")]
        public class ProgressBar : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ProgressBar ();
@@ -3947,12 +3947,12 @@ namespace Gtk {
                public bool show_text { get; set; }
                public string text { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_progress_bar_accessible_get_type ()")]
        public class ProgressBarAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Value {
                [CCode (has_construct_function = false)]
                protected ProgressBarAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_radio_action_get_type ()")]
        public class RadioAction : Gtk.ToggleAction, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                public RadioAction (string name, string? label, string? tooltip, string? stock_id, int value);
@@ -3968,7 +3968,7 @@ namespace Gtk {
                public int value { get; set; }
                public virtual signal void changed (Gtk.RadioAction current);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_radio_button_get_type ()")]
        public class RadioButton : Gtk.CheckButton, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, 
Gtk.Activatable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public RadioButton (GLib.SList<Gtk.RadioButton>? group);
@@ -3989,12 +3989,12 @@ namespace Gtk {
                public Gtk.RadioButton group { set; }
                public virtual signal void group_changed ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_radio_button_accessible_get_type ()")]
        public class RadioButtonAccessible : Gtk.ToggleButtonAccessible, Atk.Component, Atk.Action, Atk.Image 
{
                [CCode (has_construct_function = false)]
                protected RadioButtonAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_radio_menu_item_get_type ()")]
        public class RadioMenuItem : Gtk.CheckMenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, 
Gtk.Actionable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public RadioMenuItem (GLib.SList<Gtk.RadioMenuItem>? group);
@@ -4013,12 +4013,12 @@ namespace Gtk {
                public Gtk.RadioMenuItem group { set; }
                public virtual signal void group_changed ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_radio_menu_item_accessible_get_type ()")]
        public class RadioMenuItemAccessible : Gtk.CheckMenuItemAccessible, Atk.Component, Atk.Action, 
Atk.Selection {
                [CCode (has_construct_function = false)]
                protected RadioMenuItemAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_radio_tool_button_get_type ()")]
        public class RadioToolButton : Gtk.ToggleToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, 
Gtk.Actionable {
                [CCode (has_construct_function = false, type = "GtkToolItem*")]
                public RadioToolButton (GLib.SList<Gtk.RadioToolButton>? group);
@@ -4032,8 +4032,8 @@ namespace Gtk {
                public RadioToolButton.with_stock_from_widget (Gtk.RadioToolButton group, string stock_id);
                public Gtk.RadioToolButton group { set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
-       public class Range : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_range_get_type ()")]
+       public abstract class Range : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false)]
                protected Range ();
                public unowned Gtk.Adjustment get_adjustment ();
@@ -4079,7 +4079,7 @@ namespace Gtk {
                public virtual signal void move_slider (Gtk.ScrollType scroll);
                public virtual signal void value_changed ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_range_accessible_get_type ()")]
        public class RangeAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Value {
                [CCode (has_construct_function = false)]
                protected RangeAccessible ();
@@ -4101,7 +4101,7 @@ namespace Gtk {
                public static bool parse_flags (GLib.ParamSpec pspec, GLib.StringBuilder gstring, GLib.Value 
property_value);
                public static bool parse_requisition (GLib.ParamSpec pspec, GLib.StringBuilder gstring, 
GLib.Value property_value);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_rc_style_get_type ()")]
        [Deprecated (replacement = "CssProvider", since = "3.0")]
        public class RcStyle : GLib.Object {
                [CCode (array_length = false)]
@@ -4136,7 +4136,7 @@ namespace Gtk {
                [NoWrapper]
                public virtual uint parse (Gtk.Settings settings, GLib.Scanner scanner);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_recent_action_get_type ()")]
        public class RecentAction : Gtk.Action, Gtk.Buildable, Gtk.RecentChooser {
                [CCode (has_construct_function = false, type = "GtkAction*")]
                public RecentAction (string name, string label, string tooltip, string stock_id);
@@ -4146,14 +4146,14 @@ namespace Gtk {
                public void set_show_numbers (bool show_numbers);
                public bool show_numbers { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_recent_chooser_dialog_get_type ()")]
        public class RecentChooserDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable, Gtk.RecentChooser {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public RecentChooserDialog (string title, Gtk.Window parent, ...);
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public RecentChooserDialog.for_manager (string title, Gtk.Window parent, Gtk.RecentManager 
manager, ...);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_recent_chooser_menu_get_type ()")]
        public class RecentChooserMenu : Gtk.Menu, Atk.Implementor, Gtk.Buildable, Gtk.RecentChooser, 
Gtk.Activatable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public RecentChooserMenu ();
@@ -4171,14 +4171,14 @@ namespace Gtk {
                public void set_show_numbers (bool show_numbers);
                public bool show_numbers { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_recent_chooser_widget_get_type ()")]
        public class RecentChooserWidget : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, 
Gtk.RecentChooser {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public RecentChooserWidget ();
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public RecentChooserWidget.for_manager (Gtk.RecentManager manager);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_recent_filter_get_type ()")]
        public class RecentFilter : GLib.InitiallyUnowned, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                public RecentFilter ();
@@ -4232,7 +4232,7 @@ namespace Gtk {
                public string last_application ();
                public bool match (Gtk.RecentInfo info_b);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_recent_manager_get_type ()")]
        public class RecentManager : GLib.Object {
                [CCode (has_construct_function = false)]
                public RecentManager ();
@@ -4252,7 +4252,7 @@ namespace Gtk {
                public int size { get; }
                public virtual signal void changed ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_renderer_cell_accessible_get_type ()")]
        public class RendererCellAccessible : Gtk.CellAccessible, Atk.Action, Atk.Component {
                [CCode (has_construct_function = false, type = "AtkObject*")]
                public RendererCellAccessible (Gtk.CellRenderer renderer);
@@ -4266,7 +4266,7 @@ namespace Gtk {
                public int minimum_size;
                public int natural_size;
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_revealer_get_type ()")]
        public class Revealer : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Revealer ();
@@ -4282,7 +4282,7 @@ namespace Gtk {
                public uint transition_duration { get; set construct; }
                public Gtk.RevealerTransitionType transition_type { get; set construct; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_scale_get_type ()")]
        public class Scale : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Scale (Gtk.Orientation orientation, Gtk.Adjustment? adjustment);
@@ -4306,12 +4306,12 @@ namespace Gtk {
                public Gtk.PositionType value_pos { get; set; }
                public virtual signal string format_value (double value);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_scale_accessible_get_type ()")]
        public class ScaleAccessible : Gtk.RangeAccessible, Atk.Component, Atk.Value {
                [CCode (has_construct_function = false)]
                protected ScaleAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_scale_button_get_type ()")]
        public class ScaleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, 
Gtk.Activatable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ScaleButton (Gtk.IconSize size, double min = 0.0, double max = 100.0, double step = 
2.0, [CCode (array_length = false, array_null_terminated = true)] string[]? icons = null);
@@ -4334,17 +4334,17 @@ namespace Gtk {
                public virtual signal void popup ();
                public virtual signal void value_changed (double value);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_scale_button_accessible_get_type ()")]
        public class ScaleButtonAccessible : Gtk.ButtonAccessible, Atk.Component, Atk.Action, Atk.Image, 
Atk.Value {
                [CCode (has_construct_function = false)]
                protected ScaleButtonAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_scrollbar_get_type ()")]
        public class Scrollbar : Gtk.Range, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Scrollbar (Gtk.Orientation orientation, Gtk.Adjustment? adjustment);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_scrolled_window_get_type ()")]
        public class ScrolledWindow : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ScrolledWindow (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
@@ -4387,12 +4387,12 @@ namespace Gtk {
                public virtual signal void move_focus_out (Gtk.DirectionType direction);
                public virtual signal bool scroll_child (Gtk.ScrollType scroll, bool horizontal);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_scrolled_window_accessible_get_type ()")]
        public class ScrolledWindowAccessible : Gtk.ContainerAccessible, Atk.Component {
                [CCode (has_construct_function = false)]
                protected ScrolledWindowAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_search_bar_get_type ()")]
        public class SearchBar : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public SearchBar ();
@@ -4406,7 +4406,7 @@ namespace Gtk {
                public bool search_mode_enabled { get; set; }
                public bool show_close_button { get; set construct; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_search_entry_get_type ()")]
        public class SearchEntry : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public SearchEntry ();
@@ -4439,17 +4439,17 @@ namespace Gtk {
                public bool targets_include_text ();
                public bool targets_include_uri ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_separator_get_type ()")]
        public class Separator : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Separator (Gtk.Orientation orientation);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_separator_menu_item_get_type ()")]
        public class SeparatorMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, 
Gtk.Actionable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public SeparatorMenuItem ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_separator_tool_item_get_type ()")]
        public class SeparatorToolItem : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
                [CCode (has_construct_function = false, type = "GtkToolItem*")]
                public SeparatorToolItem ();
@@ -4457,7 +4457,7 @@ namespace Gtk {
                public void set_draw (bool draw);
                public bool draw { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_settings_get_type ()")]
        public class Settings : GLib.Object, Gtk.StyleProvider {
                [CCode (has_construct_function = false)]
                protected Settings ();
@@ -4635,7 +4635,7 @@ namespace Gtk {
                public weak string origin;
                public GLib.Value value;
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_size_group_get_type ()")]
        public class SizeGroup : GLib.Object, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                public SizeGroup (Gtk.SizeGroupMode mode);
@@ -4649,7 +4649,7 @@ namespace Gtk {
                public bool ignore_hidden { get; set; }
                public Gtk.SizeGroupMode mode { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtkx.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_socket_get_type ()")]
        public class Socket : Gtk.Container, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Socket ();
@@ -4659,7 +4659,7 @@ namespace Gtk {
                public virtual signal void plug_added ();
                public virtual signal bool plug_removed ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_spin_button_get_type ()")]
        public class SpinButton : Gtk.Entry, Atk.Implementor, Gtk.Buildable, Gtk.Editable, Gtk.CellEditable, 
Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public SpinButton (Gtk.Adjustment adjustment, double climb_rate, uint digits);
@@ -4702,12 +4702,12 @@ namespace Gtk {
                public virtual signal void value_changed ();
                public virtual signal void wrapped ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_spin_button_accessible_get_type ()")]
        public class SpinButtonAccessible : Gtk.EntryAccessible, Atk.Component, Atk.EditableText, Atk.Text, 
Atk.Action, Atk.Value {
                [CCode (has_construct_function = false)]
                protected SpinButtonAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_spinner_get_type ()")]
        public class Spinner : Gtk.Widget, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Spinner ();
@@ -4716,12 +4716,12 @@ namespace Gtk {
                [NoAccessorMethod]
                public bool active { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_spinner_accessible_get_type ()")]
        public class SpinnerAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Image {
                [CCode (has_construct_function = false)]
                protected SpinnerAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_stack_get_type ()")]
        public class Stack : Gtk.Container, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Stack ();
@@ -4747,7 +4747,7 @@ namespace Gtk {
                public Gtk.Widget visible_child { get; set; }
                public string visible_child_name { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_stack_switcher_get_type ()")]
        public class StackSwitcher : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public StackSwitcher ();
@@ -4828,7 +4828,7 @@ namespace Gtk {
                public virtual signal bool scroll_event (Gdk.EventScroll event);
                public virtual signal bool size_changed (int size);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_statusbar_get_type ()")]
        public class Statusbar : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Statusbar ();
@@ -4841,7 +4841,7 @@ namespace Gtk {
                public virtual signal void text_popped (uint context_id, string text);
                public virtual signal void text_pushed (uint context_id, string text);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_statusbar_accessible_get_type ()")]
        public class StatusbarAccessible : Gtk.ContainerAccessible, Atk.Component {
                [CCode (has_construct_function = false)]
                protected StatusbarAccessible ();
@@ -5042,7 +5042,7 @@ namespace Gtk {
                public Gdk.Screen screen { get; set; }
                public virtual signal void changed ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_style_properties_get_type ()")]
        public class StyleProperties : GLib.Object, Gtk.StyleProvider {
                [CCode (has_construct_function = false)]
                public StyleProperties ();
@@ -5060,7 +5060,7 @@ namespace Gtk {
                public void set_valist (Gtk.StateFlags state, va_list args);
                public void unset_property (string property, Gtk.StateFlags state);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_switch_get_type ()")]
        public class Switch : Gtk.Widget, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, Gtk.Activatable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Switch ();
@@ -5073,7 +5073,7 @@ namespace Gtk {
                public virtual signal void activate ();
                public virtual signal bool state_set (bool state);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_switch_accessible_get_type ()")]
        public class SwitchAccessible : Gtk.WidgetAccessible, Atk.Component, Atk.Action {
                [CCode (has_construct_function = false)]
                protected SwitchAccessible ();
@@ -5096,7 +5096,7 @@ namespace Gtk {
                [CCode (has_construct_function = false)]
                public SymbolicColor.win32 (string theme_class, int id);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_table_get_type ()")]
        [Deprecated (replacement = "Grid", since = "3.4")]
        public class Table : Gtk.Container, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
@@ -5175,7 +5175,7 @@ namespace Gtk {
                public uint info;
                public Gdk.Atom target;
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tearoff_menu_item_get_type ()")]
        [Deprecated (since = "3.4")]
        public class TearoffMenuItem : Gtk.MenuItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, 
Gtk.Actionable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
@@ -5229,7 +5229,7 @@ namespace Gtk {
        [Compact]
        public class TextBTree {
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_text_buffer_get_type ()")]
        public class TextBuffer : GLib.Object {
                [CCode (has_construct_function = false)]
                public TextBuffer (Gtk.TextTagTable? table);
@@ -5328,12 +5328,12 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void remove_tag (Gtk.TextTag tag, Gtk.TextIter start, Gtk.TextIter end);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_text_cell_accessible_get_type ()")]
        public class TextCellAccessible : Gtk.RendererCellAccessible, Atk.Action, Atk.Component, Atk.Text {
                [CCode (has_construct_function = false)]
                protected TextCellAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_text_child_anchor_get_type ()")]
        public class TextChildAnchor : GLib.Object {
                public void* segment;
                [CCode (has_construct_function = false)]
@@ -5341,7 +5341,7 @@ namespace Gtk {
                public bool get_deleted ();
                public GLib.List<weak Gtk.Widget> get_widgets ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_text_mark_get_type ()")]
        public class TextMark : GLib.Object {
                public void* segment;
                [CCode (has_construct_function = false)]
@@ -5355,7 +5355,7 @@ namespace Gtk {
                public bool left_gravity { get; construct; }
                public string name { get; construct; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_text_tag_get_type ()")]
        public class TextTag : GLib.Object {
                [CCode (has_construct_function = false)]
                public TextTag (string? name = null);
@@ -5495,7 +5495,7 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal bool event (GLib.Object event_object, Gdk.Event event, Gtk.TextIter 
iter);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_text_tag_table_get_type ()")]
        public class TextTagTable : GLib.Object, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                public TextTagTable ();
@@ -5508,7 +5508,7 @@ namespace Gtk {
                public virtual signal void tag_changed (Gtk.TextTag tag, bool size_changed);
                public virtual signal void tag_removed (Gtk.TextTag tag);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_text_view_get_type ()")]
        public class TextView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public TextView ();
@@ -5617,7 +5617,7 @@ namespace Gtk {
                public virtual signal void toggle_cursor_visible ();
                public virtual signal void toggle_overwrite ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_text_view_accessible_get_type ()")]
        public class TextViewAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.EditableText, Atk.Text, 
Atk.StreamableContent {
                [CCode (has_construct_function = false)]
                protected TextViewAccessible ();
@@ -5626,7 +5626,7 @@ namespace Gtk {
        [Compact]
        public class ThemeEngine {
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_theming_engine_get_type ()")]
        public class ThemingEngine : GLib.Object {
                [CCode (has_construct_function = false)]
                protected ThemingEngine ();
@@ -5692,7 +5692,7 @@ namespace Gtk {
                [NoAccessorMethod]
                public string name { owned get; construct; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_toggle_action_get_type ()")]
        public class ToggleAction : Gtk.Action, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                public ToggleAction (string name, string? label, string? tooltip, string? stock_id);
@@ -5705,7 +5705,7 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void toggled ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_toggle_button_get_type ()")]
        public class ToggleButton : Gtk.Button, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, 
Gtk.Activatable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ToggleButton ();
@@ -5726,12 +5726,12 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void toggled ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_toggle_button_accessible_get_type ()")]
        public class ToggleButtonAccessible : Gtk.ButtonAccessible, Atk.Component, Atk.Action, Atk.Image {
                [CCode (has_construct_function = false)]
                protected ToggleButtonAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_toggle_tool_button_get_type ()")]
        public class ToggleToolButton : Gtk.ToolButton, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, 
Gtk.Actionable {
                [CCode (has_construct_function = false, type = "GtkToolItem*")]
                public ToggleToolButton ();
@@ -5742,7 +5742,7 @@ namespace Gtk {
                public bool active { get; set; }
                public virtual signal void toggled ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tool_button_get_type ()")]
        public class ToolButton : Gtk.ToolItem, Atk.Implementor, Gtk.Buildable, Gtk.Activatable, 
Gtk.Actionable {
                [CCode (has_construct_function = false, type = "GtkToolItem*")]
                public ToolButton (Gtk.Widget? icon_widget, string? label);
@@ -5768,7 +5768,7 @@ namespace Gtk {
                public bool use_underline { get; set; }
                public virtual signal void clicked ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tool_item_get_type ()")]
        public class ToolItem : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Activatable {
                [CCode (has_construct_function = false)]
                public ToolItem ();
@@ -5804,7 +5804,7 @@ namespace Gtk {
                public virtual signal bool create_menu_proxy ();
                public virtual signal void toolbar_reconfigured ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tool_item_group_get_type ()")]
        public class ToolItemGroup : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ToolShell {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ToolItemGroup (string label);
@@ -5830,7 +5830,7 @@ namespace Gtk {
                public string label { get; set; }
                public Gtk.Widget label_widget { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tool_palette_get_type ()")]
        public class ToolPalette : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Orientable, 
Gtk.Scrollable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public ToolPalette ();
@@ -5861,7 +5861,7 @@ namespace Gtk {
                [NoAccessorMethod]
                public Gtk.ToolbarStyle toolbar_style { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_toolbar_get_type ()")]
        public class Toolbar : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.ToolShell, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Toolbar ();
@@ -5888,7 +5888,7 @@ namespace Gtk {
                public virtual signal bool popup_context_menu (int x, int y, int button_number);
                public virtual signal void style_changed (Gtk.ToolbarStyle style);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tooltip_get_type ()")]
        public class Tooltip : GLib.Object {
                [CCode (has_construct_function = false)]
                protected Tooltip ();
@@ -5902,13 +5902,13 @@ namespace Gtk {
                public void set_tip_area (Gdk.Rectangle rect);
                public static void trigger_tooltip_query (Gdk.Display display);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_toplevel_accessible_get_type ()")]
        public class ToplevelAccessible : Atk.Object {
                [CCode (has_construct_function = false)]
                protected ToplevelAccessible ();
                public unowned GLib.List get_children ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tree_model_filter_get_type ()")]
        public class TreeModelFilter : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource {
                [CCode (has_construct_function = false, type = "GtkTreeModel*")]
                public TreeModelFilter (Gtk.TreeModel child_model, Gtk.TreePath? root);
@@ -5931,7 +5931,7 @@ namespace Gtk {
                [NoAccessorMethod]
                public Gtk.TreePath virtual_root { owned get; construct; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tree_model_sort_get_type ()")]
        public class TreeModelSort : GLib.Object, Gtk.TreeModel, Gtk.TreeSortable, Gtk.TreeDragSource {
                [CCode (has_construct_function = false)]
                protected TreeModelSort ();
@@ -5992,7 +5992,7 @@ namespace Gtk {
                public static void reordered (GLib.Object proxy, Gtk.TreePath path, Gtk.TreeIter iter, int[] 
new_order);
                public bool valid ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tree_selection_get_type ()")]
        public class TreeSelection : GLib.Object {
                [CCode (has_construct_function = false)]
                protected TreeSelection ();
@@ -6019,7 +6019,7 @@ namespace Gtk {
                public Gtk.SelectionMode mode { get; set; }
                public virtual signal void changed ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tree_store_get_type ()")]
        public class TreeStore : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource, Gtk.TreeDragDest, 
Gtk.TreeSortable, Gtk.Buildable {
                [CCode (has_construct_function = false, sentinel = "")]
                public TreeStore (int n_columns, ...);
@@ -6049,7 +6049,7 @@ namespace Gtk {
                public void set_valuesv (Gtk.TreeIter iter, int columns, GLib.Value[] values);
                public void swap (Gtk.TreeIter a, Gtk.TreeIter b);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tree_view_get_type ()")]
        public class TreeView : Gtk.Container, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public TreeView ();
@@ -6190,12 +6190,12 @@ namespace Gtk {
                public virtual signal bool toggle_cursor_row ();
                public virtual signal bool unselect_all ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tree_view_accessible_get_type ()")]
        public class TreeViewAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Table, Atk.Selection, 
Gtk.CellAccessibleParent {
                [CCode (has_construct_function = false)]
                protected TreeViewAccessible ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_tree_view_column_get_type ()")]
        public class TreeViewColumn : GLib.InitiallyUnowned, Gtk.CellLayout, Gtk.Buildable {
                [CCode (has_construct_function = false)]
                public TreeViewColumn ();
@@ -6302,24 +6302,24 @@ namespace Gtk {
                public virtual signal void post_activate (Gtk.Action action);
                public virtual signal void pre_activate (Gtk.Action action);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_vbox_get_type ()")]
        [Deprecated (replacement = "Box", since = "3.2")]
        public class VBox : Gtk.Box, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public VBox (bool homogeneous, int spacing);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_vbutton_box_get_type ()")]
        public class VButtonBox : Gtk.ButtonBox, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public VButtonBox ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_vpaned_get_type ()")]
        [Deprecated (replacement = "Paned", since = "3.2")]
        public class VPaned : Gtk.Paned, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public VPaned ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_vscale_get_type ()")]
        [Deprecated (replacement = "Scale", since = "3.2")]
        public class VScale : Gtk.Scale, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
@@ -6327,18 +6327,18 @@ namespace Gtk {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public VScale.with_range (double min, double max, double step);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_vscrollbar_get_type ()")]
        [Deprecated (replacement = "Scrollbar", since = "3.2")]
        public class VScrollbar : Gtk.Scrollbar, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public VScrollbar (Gtk.Adjustment? adjustment);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_vseparator_get_type ()")]
        public class VSeparator : Gtk.Separator, Atk.Implementor, Gtk.Buildable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public VSeparator ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_viewport_get_type ()")]
        public class Viewport : Gtk.Bin, Atk.Implementor, Gtk.Buildable, Gtk.Scrollable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Viewport (Gtk.Adjustment? hadjustment, Gtk.Adjustment? vadjustment);
@@ -6352,7 +6352,7 @@ namespace Gtk {
                public void set_vadjustment (Gtk.Adjustment adjustment);
                public Gtk.ShadowType shadow_type { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_volume_button_get_type ()")]
        public class VolumeButton : Gtk.ScaleButton, Atk.Implementor, Gtk.Buildable, Gtk.Actionable, 
Gtk.Activatable, Gtk.Orientable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public VolumeButton ();
@@ -6769,7 +6769,7 @@ namespace Gtk {
                public virtual signal bool visibility_notify_event (Gdk.EventVisibility event);
                public virtual signal bool window_state_event (Gdk.EventWindowState event);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_widget_accessible_get_type ()")]
        public class WidgetAccessible : Gtk.Accessible, Atk.Component {
                [CCode (has_construct_function = false)]
                protected WidgetAccessible ();
@@ -6823,7 +6823,7 @@ namespace Gtk {
                public void prepend_type (GLib.Type type);
                public string to_string ();
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_window_get_type ()")]
        public class Window : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Window (Gtk.WindowType type = Gtk.WindowType.TOPLEVEL);
@@ -6991,7 +6991,7 @@ namespace Gtk {
                [HasEmitter]
                public virtual signal void set_focus (Gtk.Widget? focus);
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_window_accessible_get_type ()")]
        public class WindowAccessible : Gtk.ContainerAccessible, Atk.Component, Atk.Window {
                [CCode (has_construct_function = false)]
                protected WindowAccessible ();
@@ -7000,7 +7000,7 @@ namespace Gtk {
        [Compact]
        public class WindowGeometryInfo {
        }
-       [CCode (cheader_filename = "gtk/gtk.h")]
+       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_window_group_get_type ()")]
        public class WindowGroup : GLib.Object {
                [CCode (has_construct_function = false)]
                public WindowGroup ();
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
index 3f08bb9..58f3851 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0-custom.vala
@@ -42,7 +42,7 @@ namespace Gtk {
                public static unowned BindingSet @new (string name);
        }
 
-       public class Container {
+       public abstract class Container {
                [CCode (vfunc_name = "forall")]
                [NoWrapper]
                public virtual void forall_internal(bool include_internal, Gtk.Callback callback);
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index fcb99d5..613241e 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -31,12 +31,10 @@ gtk_action_get_proxies type_arguments="Widget"
 gtk_action_new.label nullable="1"
 gtk_action_new.tooltip nullable="1"
 gtk_action_new.stock_id nullable="1"
-GtkAction deprecated_since="3.10" replacement="GLib.Action"
 GtkAction::activate has_emitter="1"
 gtk_action_bar_set_center_widget.center_widget nullable="1"
 GtkActionEntry is_value_type="1"
 GtkActionEntry.callback type_name="ActionCallback" ctype="GCallback" no_delegate_target="1" value_owned="0"
-GtkActionGroup deprecated_since="3.10"
 gtk_action_group_add_action_with_accel.accelerator nullable="1"
 gtk_action_group_add_actions.user_data hidden="0"
 gtk_action_group_add_actions_full.user_data hidden="0"
@@ -212,7 +210,6 @@ gtk_cell_renderer_get_size.y_offset is_out="1"
 gtk_cell_renderer_get_size.width is_out="1"
 gtk_cell_renderer_get_size.height is_out="1"
 gtk_cell_renderer_render abstract="1"
-GtkCellRenderer abstract="1"
 GtkCellRenderer::editing_canceled has_emitter="1"
 GtkCellRendererText:background-gdk deprecated_since="3.4" replacement="background_rgba"
 GtkCellRendererText:foreground-gdk deprecated_since="3.4" replacement="foreground_rgba"
@@ -287,7 +284,6 @@ gtk_container_get_children transfer_ownership="1" type_arguments="unowned Widget
 gtk_container_get_focus_chain.focusable_widgets is_out="1" takes_ownership="1" type_arguments="unowned 
Widget"
 gtk_container_get_path_for_child transfer_ownership="1"
 gtk_container_set_focus_chain.focusable_widgets type_arguments="Widget"
-GtkContainerClass name="pointer"
 gtk_container_cell_accessible_get_children type_arguments="CellAccessible"
 gtk_css_provider_get_named.variant nullable="1"
 gtk_css_provider_to_string transfer_ownership="1"
@@ -402,7 +398,6 @@ GtkFontChooser:preview-text owned_get="1"
 gtk_font_selection_get_font_name transfer_ownership="1"
 GtkFontSelection:font-name owned_get="1"
 gtk_font_selection_dialog_get_font_name transfer_ownership="1"
-GtkFontSelectionDialog deprecated_since="3.2" replacement="FontChooserDialog"
 gtk_frame_new.label nullable="1"
 gtk_frame_get_label_align.xalign is_out="1"
 gtk_frame_get_label_align.yalign is_out="1"
@@ -442,19 +437,11 @@ gtk_gesture_swipe_get_velocity.velocity_y is_out="1"
 gtk_gradient_resolve.resolved_gradient transfer_ownership="1"
 gtk_gradient_resolve_for_context transfer_ownership="1"
 gtk_gradient_to_string transfer_ownership="1"
-GtkHandleBox deprecated_since="3.4"
-GtkHBox deprecated_since="3.2" replacement="Grid"
-GtkHPaned deprecated_since="3.2" replacement="Paned"
-GtkHScale deprecated_since="3.2" replacment="Scale"
-GtkHScrollbar deprecated_since="3.2" replacment="Scrollbar"
 gtk_hscrollbar_new.adjustment nullable="1"
-GtkHSeparator deprecated_since="3.2" replacement="Separator"
 gtk_hsv_get_*.* is_out="1"
 gtk_hsv_to_rgb.r is_out="1"
 gtk_hsv_to_rgb.g is_out="1"
 gtk_hsv_to_rgb.b is_out="1"
-GtkIconFactory deprecated_since="3.10" replacement="Gtk.IconTheme"
-GtkIconInfo compact="1" copy_function="gtk_icon_info_copy" free_function="gtk_icon_info_free"
 gtk_icon_info_copy transfer_ownership="1"
 gtk_icon_info_get_attach_points.points is_array="1" is_out="1" transfer_ownership="1"
 gtk_icon_info_get_embedded_rect.rectangle is_out="1"
@@ -495,7 +482,6 @@ gtk_icon_set_get_sizes.sizes is_array="1" is_out="1" transfer_ownership="1"
 gtk_icon_set_render_icon transfer_ownership="1" deprecated_since="3.0" replacement="set_render_icon_pixbuf"
 gtk_icon_set_render_icon_pixbuf transfer_ownership="1" deprecated_since="3.10"
 gtk_icon_set_render_icon_surface transfer_ownership="1" deprecated_since="3.10"
-GtkIconSource deprecated_since="3.10" replacement="Gtk.IconTheme"
 gtk_icon_source_copy transfer_ownership="1"
 gtk_icon_theme_get_example_icon_name transfer_ownership="1" nullable="1"
 gtk_icon_theme_get_icon_sizes is_array="1" no_array_length="1" array_null_terminated="1" 
transfer_ownership="1"
@@ -641,7 +627,6 @@ GtkMenuItem::activate has_emitter="1"
 GtkMenuItem::toggle_size_allocate has_emitter="1"
 GtkMenuItem::toggle_size_request has_emitter="1"
 gtk_menu_set_screen.screen nullable="1"
-GtkMenuShell abstract="1"
 GtkMenuShell.children type_arguments="MenuItem" weak="0"
 GtkMenuShell::cancel has_emitter="1"
 GtkMenuShell::deactivate has_emitter="1"
@@ -807,7 +792,6 @@ gtk_radio_action_get_group type_arguments="RadioAction"
 gtk_radio_action_set_group.group type_arguments="RadioAction"
 GtkRadioActionEntry is_value_type="1"
 GtkRadioButton:group accessor_method="0"
-GtkRcStyle deprecated_since="3.0" replacement="CssProvider"
 gtk_radio_button_get_group type_arguments="RadioButton"
 gtk_radio_button_new.group nullable="1" type_arguments="RadioButton"
 gtk_radio_button_new_*from_widget.radio_group_member nullable="1"
@@ -995,7 +979,6 @@ gtk_symbolic_color_resolve.resolved_color is_out="1"
 gtk_symbolic_color_to_string transfer_ownership="1"
 gtk_table_get_size.rows is_out="1"
 gtk_table_get_size.columns is_out="1"
-GtkTable deprecated_since="3.4" replacement="Grid"
 GtkTable:row-spacing accessor_method="0"
 GtkTargetEntry is_value_type="1"
 GtkTargetList.list type_arguments="TargetPair"
@@ -1006,7 +989,6 @@ gtk_target_list_new.targets is_array="1" nullable="1"
 gtk_target_list_new.ntargets hidden="1"
 gtk_target_table_new_from_list is_array="1" transfer_ownership="1"
 gtk_target_table_new_from_list.n_targets hidden="1"
-GtkTearoffMenuItem deprecated_since="3.4"
 gtk_test_init ellipsis="1"
 gtk_test_init.argcp hidden="1"
 gtk_test_init.argvp is_array="1" is_ref="1" array_length_pos="0.9"
@@ -1165,7 +1147,6 @@ GtkTranslateFunc.func_data hidden="1"
 GtkTreeIter is_value_type="1"
 gtk_tree_iter_copy hidden="1"
 gtk_tree_iter_free hidden="1"
-GtkTreeRowReference is_value_type="0" is_immutable="1"
 gtk_tree_row_reference_copy transfer_ownership="1"
 gtk_tree_model_filter_new.root nullable="1"
 gtk_tree_model_get ellipsis="1" sentinel="-1"
@@ -1219,9 +1200,6 @@ gtk_tree_path_new_from_indicesv.indices is_array="1" array_length_pos="1.9"
 gtk_tree_path_new_from_indicesv.length hidden="1"
 gtk_tree_path_copy transfer_ownership="1"
 gtk_tree_path_to_string transfer_ownership="1"
-# GtkTreePath should be an opaque value type as it is not immutable
-# but should have copy-on-assignment semantics
-GtkTreePath is_value_type="0" is_immutable="1" const_cname="GtkTreePath"
 gtk_tree_row_reference_reordered.new_order is_array="1"
 gtk_tree_row_reference_get_path transfer_ownership="1"
 gtk_tree_selection_get_selected.iter is_out="1"
@@ -1366,13 +1344,9 @@ gtk_ui_manager_get_toplevels transfer_ownership="1" type_arguments="unowned Widg
 gtk_ui_manager_get_ui transfer_ownership="1"
 gtk_ui_manager_new_merge_id hidden="1"
 gtk_ui_manager_set_add_tearoffs deprecated_since="3.4"
-GtkVBox deprecated_since="3.2" replacement="Box"
 gtk_viewport_new.hadjustment nullable="1"
 gtk_viewport_new.vadjustment nullable="1"
-GtkVPaned deprecated_since="3.2" replacement="Paned"
-GtkVScale deprecated_since="3.2" replacement="Scale"
 gtk_vscale_new.adjustment nullable="1"
-GtkVScrollbar deprecated_since="3.2" replacement="Scrollbar"
 gtk_vscrollbar_new.adjustment nullable="1"
 gtk_widget_add_tick_callback.callback transfer_ownership="1"
 gtk_widget_add_tick_callback.notify hidden="1"
@@ -1598,4 +1572,261 @@ GtkIconThemeError errordomain="1"
 GtkRecentChooserError errordomain="1"
 GtkRecentManagerError errordomain="1"
 
+// type modifications (type-ids, deprecations)
+GtkAboutDialog type_id="gtk_about_dialog_get_type ()"
+GtkAccelGroup type_id="gtk_accel_group_get_type ()"
+GtkAccelLabel type_id="gtk_accel_label_get_type ()"
+GtkAccelMap type_id="gtk_accel_map_get_type ()"
+GtkAccessible type_id="gtk_accessible_get_type ()"
+GtkAction type_id="gtk_action_get_type ()" deprecated_since="3.10" replacement="GLib.Action"
+GtkActionBar type_id="gtk_action_bar_get_type ()"
+GtkActionGroup type_id="gtk_action_group_get_type ()" deprecated_since="3.10"
+GtkAdjustment type_id="gtk_adjustment_get_type ()"
+GtkAlignment type_id="gtk_alignment_get_type ()"
+GtkAppChooserButton type_id="gtk_app_chooser_button_get_type ()"
+GtkAppChooserDialog type_id="gtk_app_chooser_dialog_get_type ()"
+GtkAppChooserWidget type_id="gtk_app_chooser_widget_get_type ()"
+GtkApplication type_id="gtk_application_get_type ()"
+GtkApplicationWindow type_id="gtk_application_window_get_type ()"
+GtkArrow type_id="gtk_arrow_get_type ()"
+GtkArrowAccessible type_id="gtk_arrow_accessible_get_type ()"
+GtkAspectFrame type_id="gtk_aspect_frame_get_type ()"
+GtkAssistant type_id="gtk_assistant_get_type ()"
+GtkBin type_id="gtk_bin_get_type ()" abstract="1"
+GtkBooleanCellAccessible type_id="gtk_boolean_cell_accessible_get_type ()"
+GtkBox type_id="gtk_box_get_type ()"
+GtkBuilder type_id="gtk_builder_get_type ()"
+GtkButton type_id="gtk_button_get_type ()"
+GtkButtonAccessible type_id="gtk_button_accessible_get_type ()"
+GtkButtonBox type_id="gtk_button_box_get_type ()"
+GtkCalendar type_id="gtk_calendar_get_type ()"
+GtkCellAccessible type_id="gtk_cell_accessible_get_type ()"
+GtkCellArea type_id="gtk_cell_area_get_type ()" abstract="1"
+GtkCellAreaBox type_id="gtk_cell_area_box_get_type ()"
+GtkCellAreaContext type_id="gtk_cell_area_context_get_type ()"
+GtkCellRenderer type_id="gtk_cell_renderer_get_type ()" abstract="1"
+GtkCellRendererAccel type_id="gtk_cell_renderer_accel_get_type ()"
+GtkCellRendererCombo type_id="gtk_cell_renderer_combo_get_type ()"
+GtkCellRendererPixbuf type_id="gtk_cell_renderer_pixbuf_get_type ()"
+GtkCellRendererProgress type_id="gtk_cell_renderer_progress_get_type ()"
+GtkCellRendererSpin type_id="gtk_cell_renderer_spin_get_type ()"
+GtkCellRendererSpinner type_id="gtk_cell_renderer_spinner_get_type ()"
+GtkCellRendererText type_id="gtk_cell_renderer_text_get_type ()"
+GtkCellRendererToggle type_id="gtk_cell_renderer_toggle_get_type ()"
+GtkCellView type_id="gtk_cell_view_get_type ()"
+GtkCheckButton type_id="gtk_check_button_get_type ()"
+GtkCheckMenuItem type_id="gtk_check_menu_item_get_type ()"
+GtkCheckMenuItemAccessible type_id="gtk_check_menu_item_accessible_get_type ()"
+GtkClipboard type_id="gtk_clipboard_get_type ()"
+GtkColorButton type_id="gtk_color_button_get_type ()"
+GtkColorChooserDialog type_id="gtk_color_chooser_dialog_get_type ()"
+GtkColorChooserWidget type_id="gtk_color_chooser_widget_get_type ()"
+GtkColorSelection type_id="gtk_color_selection_get_type ()"
+GtkColorSelectionDialog type_id="gtk_color_selection_dialog_get_type ()"
+GtkComboBox type_id="gtk_combo_box_get_type ()"
+GtkComboBoxAccessible type_id="gtk_combo_box_accessible_get_type ()"
+GtkComboBoxText type_id="gtk_combo_box_text_get_type ()"
+//GtkContainer type_id="gtk_container_get_type ()" abstract="1"
+GtkContainerAccessible type_id="gtk_container_accessible_get_type ()"
+GtkContainerCellAccessible type_id="gtk_container_cell_accessible_get_type ()"
+GtkDialog type_id="gtk_dialog_get_type ()"
+GtkDrawingArea type_id="gtk_drawing_area_get_type ()"
+GtkEntry type_id="gtk_entry_get_type ()"
+GtkEntryAccessible type_id="gtk_entry_accessible_get_type ()"
+GtkEntryBuffer type_id="gtk_entry_buffer_get_type ()"
+GtkEntryCompletion type_id="gtk_entry_completion_get_type ()"
+GtkEntryIconAccessible type_id="gtk_entry_icon_accessible_get_type ()"
+GtkEventBox type_id="gtk_event_box_get_type ()"
+GtkEventController type_id="gtk_event_controller_get_type ()" abstract="1"
+GtkExpander type_id="gtk_expander_get_type ()"
+GtkExpanderAccessible type_id="gtk_expander_accessible_get_type ()"
+GtkFileChooserButton type_id="gtk_file_chooser_button_get_type ()"
+GtkFileChooserDialog type_id="gtk_file_chooser_dialog_get_type ()"
+GtkFileChooserWidget type_id="gtk_file_chooser_widget_get_type ()"
+GtkFileFilter type_id="gtk_file_filter_get_type ()"
+GtkFixed type_id="gtk_fixed_get_type ()"
+GtkFlowBox type_id="gtk_flow_box_get_type ()"
+GtkFlowBoxAccessible type_id="gtk_flow_box_accessible_get_type ()"
+GtkFlowBoxChild type_id="gtk_flow_box_child_get_type ()"
+GtkFlowBoxChildAccessible type_id="gtk_flow_box_child_accessible_get_type ()"
+GtkFontButton type_id="gtk_font_button_get_type ()"
+GtkFontChooserDialog type_id="gtk_font_chooser_dialog_get_type ()"
+GtkFontChooserWidget type_id="gtk_font_chooser_widget_get_type ()"
+GtkFontSelection type_id="gtk_font_selection_get_type ()"
+GtkFontSelectionDialog type_id="gtk_font_selection_dialog_get_type ()" deprecated_since="3.2" 
replacement="FontChooserDialog"
+GtkFrame type_id="gtk_frame_get_type ()"
+GtkFrameAccessible type_id="gtk_frame_accessible_get_type ()"
+GtkGesture type_id="gtk_gesture_get_type ()" abstract="1"
+GtkGestureDrag type_id="gtk_gesture_drag_get_type ()"
+GtkGestureLongPress type_id="gtk_gesture_long_press_get_type ()"
+GtkGestureMultiPress type_id="gtk_gesture_multi_press_get_type ()"
+GtkGesturePan type_id="gtk_gesture_pan_get_type ()"
+GtkGestureRotate type_id="gtk_gesture_rotate_get_type ()"
+GtkGestureSingle type_id="gtk_gesture_single_get_type ()"
+GtkGestureSwipe type_id="gtk_gesture_swipe_get_type ()"
+GtkGestureZoom type_id="gtk_gesture_zoom_get_type ()"
+GtkGrid type_id="gtk_grid_get_type ()"
+GtkHBox type_id="gtk_hbox_get_type ()" deprecated_since="3.2" replacement="Grid"
+GtkHButtonBox type_id="gtk_hbutton_box_get_type ()"
+GtkHPaned type_id="gtk_hpaned_get_type ()" deprecated_since="3.2" replacement="Paned"
+GtkHSV type_id="gtk_hsv_get_type ()"
+GtkHScale type_id="gtk_hscale_get_type ()" deprecated_since="3.2" replacment="Scale"
+GtkHScrollbar type_id="gtk_hscrollbar_get_type ()" deprecated_since="3.2" replacment="Scrollbar"
+GtkHSeparator type_id="gtk_hseparator_get_type ()" deprecated_since="3.2" replacement="Separator"
+GtkHandleBox type_id="gtk_handle_box_get_type ()" deprecated_since="3.4"
+GtkHeaderBar type_id="gtk_header_bar_get_type ()"
+GtkIMContext type_id="gtk_im_context_get_type ()" abstract="1"
+GtkIMContextSimple type_id="gtk_im_context_simple_get_type ()"
+GtkIMMulticontext type_id="gtk_im_multicontext_get_type ()"
+GtkIconFactory type_id="gtk_icon_factory_get_type ()" deprecated_since="3.10" replacement="Gtk.IconTheme"
+GtkIconInfo type_id="gtk_icon_info_get_type ()" compact="1" copy_function="gtk_icon_info_copy" 
free_function="gtk_icon_info_free"
+GtkIconSource type_id="gtk_icon_source_get_type ()" deprecated_since="3.10" replacement="Gtk.IconTheme"
+GtkIconTheme type_id="gtk_icon_theme_get_type ()"
+GtkIconView type_id="gtk_icon_view_get_type ()"
+GtkIconViewAccessible type_id="gtk_icon_view_accessible_get_type ()"
+GtkImage type_id="gtk_image_get_type ()"
+GtkImageAccessible type_id="gtk_image_accessible_get_type ()"
+GtkImageCellAccessible type_id="gtk_image_cell_accessible_get_type ()"
+GtkImageMenuItem type_id="gtk_image_menu_item_get_type ()"
+GtkInfoBar type_id="gtk_info_bar_get_type ()"
+GtkInvisible type_id="gtk_invisible_get_type ()"
+GtkLabel type_id="gtk_label_get_type ()"
+GtkLabelAccessible type_id="gtk_label_accessible_get_type ()"
+GtkLayout type_id="gtk_layout_get_type ()"
+GtkLevelBar type_id="gtk_level_bar_get_type ()"
+GtkLevelBarAccessible type_id="gtk_level_bar_accessible_get_type ()"
+GtkLinkButton type_id="gtk_link_button_get_type ()"
+GtkLinkButtonAccessible type_id="gtk_link_button_accessible_get_type ()"
+GtkListBox type_id="gtk_list_box_get_type ()"
+GtkListBoxAccessible type_id="gtk_list_box_accessible_get_type ()"
+GtkListBoxRow type_id="gtk_list_box_row_get_type ()"
+GtkListBoxRowAccessible type_id="gtk_list_box_row_accessible_get_type ()"
+GtkListStore type_id="gtk_list_store_get_type ()"
+GtkLockButton type_id="gtk_lock_button_get_type ()"
+GtkLockButtonAccessible type_id="gtk_lock_button_accessible_get_type ()"
+GtkMenu type_id="gtk_menu_get_type ()"
+GtkMenuAccessible type_id="gtk_menu_accessible_get_type ()"
+GtkMenuBar type_id="gtk_menu_bar_get_type ()"
+GtkMenuButton type_id="gtk_menu_button_get_type ()"
+GtkMenuButtonAccessible type_id="gtk_menu_button_accessible_get_type ()"
+GtkMenuItem type_id="gtk_menu_item_get_type ()"
+GtkMenuItemAccessible type_id="gtk_menu_item_accessible_get_type ()"
+GtkMenuShell type_id="gtk_menu_shell_get_type ()" abstract="1"
+GtkMenuShellAccessible type_id="gtk_menu_shell_accessible_get_type ()"
+GtkMenuToolButton type_id="gtk_menu_tool_button_get_type ()"
+GtkMessageDialog type_id="gtk_message_dialog_get_type ()"
+GtkMisc type_id="gtk_misc_get_type ()" abstract="1"
+GtkMountOperation type_id="gtk_mount_operation_get_type ()"
+GtkNotebook type_id="gtk_notebook_get_type ()"
+GtkNotebookAccessible type_id="gtk_notebook_accessible_get_type ()"
+GtkNotebookPageAccessible type_id="gtk_notebook_page_accessible_get_type ()"
+GtkNumerableIcon type_id="gtk_numerable_icon_get_type ()"
+GtkOffscreenWindow type_id="gtk_offscreen_window_get_type ()"
+GtkOverlay type_id="gtk_overlay_get_type ()"
+GtkPageSetup type_id="gtk_page_setup_get_type ()"
+GtkPaned type_id="gtk_paned_get_type ()"
+GtkPanedAccessible type_id="gtk_paned_accessible_get_type ()"
+GtkPaperSize type_id="gtk_paper_size_get_type ()"
+GtkPlacesSidebar type_id="gtk_places_sidebar_get_type ()"
+GtkPlug type_id="gtk_plug_get_type ()"
+GtkPopover type_id="gtk_popover_get_type ()"
+GtkPopoverAccessible type_id="gtk_popover_accessible_get_type ()"
+GtkPrintContext type_id="gtk_print_context_get_type ()"
+GtkPrintOperation type_id="gtk_print_operation_get_type ()"
+GtkPrintSettings type_id="gtk_print_settings_get_type ()"
+GtkProgressBar type_id="gtk_progress_bar_get_type ()"
+GtkProgressBarAccessible type_id="gtk_progress_bar_accessible_get_type ()"
+GtkRadioAction type_id="gtk_radio_action_get_type ()"
+GtkRadioButton type_id="gtk_radio_button_get_type ()"
+GtkRadioButtonAccessible type_id="gtk_radio_button_accessible_get_type ()"
+GtkRadioMenuItem type_id="gtk_radio_menu_item_get_type ()"
+GtkRadioMenuItemAccessible type_id="gtk_radio_menu_item_accessible_get_type ()"
+GtkRadioToolButton type_id="gtk_radio_tool_button_get_type ()"
+GtkRange type_id="gtk_range_get_type ()" abstract="1"
+GtkRangeAccessible type_id="gtk_range_accessible_get_type ()"
+GtkRcStyle type_id="gtk_rc_style_get_type ()" deprecated_since="3.0" replacement="CssProvider"
+GtkRecentAction type_id="gtk_recent_action_get_type ()"
+GtkRecentChooserDialog type_id="gtk_recent_chooser_dialog_get_type ()"
+GtkRecentChooserMenu type_id="gtk_recent_chooser_menu_get_type ()"
+GtkRecentChooserWidget type_id="gtk_recent_chooser_widget_get_type ()"
+GtkRecentFilter type_id="gtk_recent_filter_get_type ()"
+GtkRecentManager type_id="gtk_recent_manager_get_type ()"
+GtkRendererCellAccessible type_id="gtk_renderer_cell_accessible_get_type ()"
+GtkRevealer type_id="gtk_revealer_get_type ()"
+GtkScale type_id="gtk_scale_get_type ()"
+GtkScaleAccessible type_id="gtk_scale_accessible_get_type ()"
+GtkScaleButton type_id="gtk_scale_button_get_type ()"
+GtkScaleButtonAccessible type_id="gtk_scale_button_accessible_get_type ()"
+GtkScrollbar type_id="gtk_scrollbar_get_type ()"
+GtkScrolledWindow type_id="gtk_scrolled_window_get_type ()"
+GtkScrolledWindowAccessible type_id="gtk_scrolled_window_accessible_get_type ()"
+GtkSearchBar type_id="gtk_search_bar_get_type ()"
+GtkSearchEntry type_id="gtk_search_entry_get_type ()"
+GtkSelectionData type_id="gtk_selection_data_get_type ()"
+GtkSeparator type_id="gtk_separator_get_type ()"
+GtkSeparatorMenuItem type_id="gtk_separator_menu_item_get_type ()"
+GtkSeparatorToolItem type_id="gtk_separator_tool_item_get_type ()"
+GtkSettings type_id="gtk_settings_get_type ()"
+GtkSizeGroup type_id="gtk_size_group_get_type ()"
+GtkSocket type_id="gtk_socket_get_type ()"
+GtkSpinButton type_id="gtk_spin_button_get_type ()"
+GtkSpinButtonAccessible type_id="gtk_spin_button_accessible_get_type ()"
+GtkSpinner type_id="gtk_spinner_get_type ()"
+GtkSpinnerAccessible type_id="gtk_spinner_accessible_get_type ()"
+GtkStack type_id="gtk_stack_get_type ()"
+GtkStackSwitcher type_id="gtk_stack_switcher_get_type ()"
+GtkStatusIcon type_id="gtk_status_icon_get_type ()"
+GtkStatusbar type_id="gtk_statusbar_get_type ()"
+GtkStatusbarAccessible type_id="gtk_statusbar_accessible_get_type ()"
+GtkStyleContext type_id="gtk_style_context_get_type ()"
+GtkStyleProperties type_id="gtk_style_properties_get_type ()"
+GtkSwitch type_id="gtk_switch_get_type ()"
+GtkSwitchAccessible type_id="gtk_switch_accessible_get_type ()"
+GtkTable type_id="gtk_table_get_type ()" deprecated_since="3.4" replacement="Grid"
+GtkTearoffMenuItem type_id="gtk_tearoff_menu_item_get_type ()" deprecated_since="3.4"
+GtkTextBuffer type_id="gtk_text_buffer_get_type ()"
+GtkTextCellAccessible type_id="gtk_text_cell_accessible_get_type ()"
+GtkTextChildAnchor type_id="gtk_text_child_anchor_get_type ()"
+GtkTextMark type_id="gtk_text_mark_get_type ()"
+GtkTextTag type_id="gtk_text_tag_get_type ()"
+GtkTextTagTable type_id="gtk_text_tag_table_get_type ()"
+GtkTextView type_id="gtk_text_view_get_type ()"
+GtkTextViewAccessible type_id="gtk_text_view_accessible_get_type ()"
+GtkThemingEngine type_id="gtk_theming_engine_get_type ()"
+GtkToggleAction type_id="gtk_toggle_action_get_type ()"
+GtkToggleButton type_id="gtk_toggle_button_get_type ()"
+GtkToggleButtonAccessible type_id="gtk_toggle_button_accessible_get_type ()"
+GtkToggleToolButton type_id="gtk_toggle_tool_button_get_type ()"
+GtkToolButton type_id="gtk_tool_button_get_type ()"
+GtkToolItem type_id="gtk_tool_item_get_type ()"
+GtkToolItemGroup type_id="gtk_tool_item_group_get_type ()"
+GtkToolPalette type_id="gtk_tool_palette_get_type ()"
+GtkToolbar type_id="gtk_toolbar_get_type ()"
+GtkTooltip type_id="gtk_tooltip_get_type ()"
+GtkToplevelAccessible type_id="gtk_toplevel_accessible_get_type ()"
+GtkTreeModelFilter type_id="gtk_tree_model_filter_get_type ()"
+GtkTreeModelSort type_id="gtk_tree_model_sort_get_type ()"
+# GtkTreePath should be an opaque value type as it is not immutable
+# but should have copy-on-assignment semantics
+GtkTreePath type_id="gtk_tree_path_get_type ()" is_value_type="0" is_immutable="1" const_cname="GtkTreePath"
+GtkTreeRowReference type_id="gtk_tree_row_reference_get_type ()" is_value_type="0" is_immutable="1"
+GtkTreeSelection type_id="gtk_tree_selection_get_type ()"
+GtkTreeStore type_id="gtk_tree_store_get_type ()"
+GtkTreeView type_id="gtk_tree_view_get_type ()"
+GtkTreeViewAccessible type_id="gtk_tree_view_accessible_get_type ()"
+GtkTreeViewColumn type_id="gtk_tree_view_column_get_type ()"
+GtkUIManager type_id="gtk_ui_manager_get_type ()"
+GtkVBox type_id="gtk_vbox_get_type ()" deprecated_since="3.2" replacement="Box"
+GtkVButtonBox type_id="gtk_vbutton_box_get_type ()"
+GtkVPaned type_id="gtk_vpaned_get_type ()" deprecated_since="3.2" replacement="Paned"
+GtkVScale type_id="gtk_vscale_get_type ()" deprecated_since="3.2" replacement="Scale"
+GtkVScrollbar type_id="gtk_vscrollbar_get_type ()" deprecated_since="3.2" replacement="Scrollbar"
+GtkVSeparator type_id="gtk_vseparator_get_type ()"
+GtkViewport type_id="gtk_viewport_get_type ()"
+GtkVolumeButton type_id="gtk_volume_button_get_type ()"
+GtkWidgetAccessible type_id="gtk_widget_accessible_get_type ()"
+GtkWindow type_id="gtk_window_get_type ()"
+GtkWindowAccessible type_id="gtk_window_accessible_get_type ()"
+GtkWindowGroup type_id="gtk_window_group_get_type ()"
+
 *._g_sealed__* hidden="1"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]