Improved gstreamer wrapping

8 files changed, 2390 insertions, 523 deletions

diff --git a/src/include/gtkclass.h b/src/include/gtkclass.h
index 4b9cd1f9..c7d1d357 100644
--- a/src/include/gtkclass.h
+++ b/src/include/gtkclass.h
@@ -22,6 +22,17 @@ typedef struct my_GValue_s
   } data[2];
 } my_GValue_t;
 
+typedef struct my_GTypeInstance_s
+{
+  void* g_class;
+} my_GTypeInstance_t;
+
+typedef struct my_GObject_s
+{
+  my_GTypeInstance_t  g_type_instance;
+  uint32_t            ref_count;
+  void*               qdata;
+} my_GObject_t;
 
 typedef struct my_GObjectClass_s
 {
@@ -39,6 +50,13 @@ typedef struct my_GObjectClass_s
   void*  pdummy[6];
 } my_GObjectClass_t;
 
+typedef struct my_GInitiallyUnowned_s
+{
+  my_GTypeInstance_t  g_type_instance;
+  uint32_t            ref_count;
+  void*               qdata;
+} my_GInitiallyUnowned_t;
+
 typedef struct my_GInitiallyUnownedClass_s
 {
   int   g_type_class;
@@ -55,15 +73,15 @@ typedef struct my_GInitiallyUnownedClass_s
   void*  pdummy[6];
 } my_GInitiallyUnownedClass_t;
 
-typedef struct my_GamesScoresImporterClass_s
+typedef struct my_GApplication_s
 {
-    my_GObjectClass_t parent_class;
-    void (*importOldScores) (void *self, void* context, void* new_scores_dir, void *error);
-}my_GamesScoresImporterClass_t;
+  my_GObject_t parent;
+  void* priv;
+} my_GApplication_t;
 
 typedef struct my_GApplicationClass_s
 {
-    void* construct_properties;
+    my_GObjectClass_t parent_class;
     void (* startup) (void* application);
     void (* activate) (void* application);
     void (* open) (void* application, void* files, int n_files, void* hint);
@@ -79,10 +97,15 @@ typedef struct my_GApplicationClass_s
     void (* dbus_unregister) (void* appvoidlication, void* connection, void* object_path);
     int (* handle_local_options) (void* application, void* options);
     int (* name_lost) (void* application);
-    uint32_t flags;
-    void*  pdummy[6];
+    void*  padding[7];
 } my_GApplicationClass_t;
 
+typedef struct my_GtkApplication_s
+{
+  my_GApplication_t parent;
+  void* priv;
+} my_GtkApplication_t;
+
 typedef struct my_GtkApplicationClass_s
 {
   my_GApplicationClass_t   parent_class;
@@ -90,14 +113,47 @@ typedef struct my_GtkApplicationClass_s
   void (*window_removed)   (void* application, void* window);
 } my_GtkApplicationClass_t;
 
+typedef struct my_GtkObject_s
+{
+  my_GInitiallyUnowned_t parent;
+  uint32_t flags;
+} my_GtkObject_t;
+
 typedef struct my_GtkObjectClass_s
 {
-  my_GObjectClass_t parent_class;
+  my_GInitiallyUnownedClass_t parent_class;
   void (*set_arg) (void* object, void* arg, uint32_t arg_id);
   void (*get_arg) (void* object, void* arg, uint32_t arg_id);
   void (*destroy) (void* object);
 } my_GtkObjectClass_t;
 
+typedef struct my_GdkRectangle_s
+{
+  int x;
+  int y;
+  int width;
+  int height;
+} my_GdkRectangle_t;
+
+typedef struct my_GtkRequisition_s
+{
+  int width;
+  int height;
+} my_GtkRequisition_t;
+
+typedef struct my_GtkWidget2_s
+{
+  my_GtkObject_t  private;
+  int16_t         private_flags;
+  uint8_t         state;
+  char*           name;
+  void*           style;  //GtkStyle
+  my_GtkRequisition_t requisition;
+  my_GdkRectangle_t   allocation;
+  void*           window; //GdkWindow
+  void*           parent; //GtkWidget
+} my_GtkWidget2_t;
+
 typedef struct my_GtkWidget2Class_s
 {
   my_GtkObjectClass_t parent_class;
@@ -174,6 +230,12 @@ typedef struct my_GtkWidget2Class_s
   void (*_gtk_reserved7) (void);
 } my_GtkWidget2Class_t;
 
+typedef struct my_GtkWidget3_s
+{
+  my_GInitiallyUnowned_t  parent;
+  void*                   priv;
+} my_GtkWidget3_t;
+
 typedef struct my_GtkWidget3Class_s
 {
   my_GInitiallyUnownedClass_t parent_class;
@@ -265,6 +327,17 @@ typedef struct my_GtkWidget3Class_s
   void (*_gtk_reserved7) (void);
 } my_GtkWidget3Class_t;
 
+typedef struct my_GtkContainer2_s
+{
+  my_GtkWidget2_t parent;
+  void*           focus_child;  //GtkWidget
+  uint32_t        border_width : 16;
+  uint32_t        need_resize : 1;
+  uint32_t        resize_mode : 2;
+  uint32_t        reallocate_redraws : 1;
+  uint32_t        has_focus_chain : 1;
+} my_GtkContainer2_t;
+
 typedef struct my_GtkContainer2Class_s 
 {
   my_GtkWidget2Class_t parent_class;
@@ -283,6 +356,12 @@ typedef struct my_GtkContainer2Class_s
   void (*_gtk_reserved4) (void);
 } my_GtkContainer2Class_t;
 
+typedef struct my_GtkContainer3_s
+{
+  my_GtkWidget3_t parent;
+  void*           priv;
+} my_GtkContainer3_t;
+
 typedef struct my_GtkContainer3Class_s 
 {
   my_GtkWidget3Class_t parent_class;
@@ -307,6 +386,12 @@ typedef struct my_GtkContainer3Class_s
   void (*_gtk_reserved8) (void);
 } my_GtkContainer3Class_t;
 
+typedef struct my_GtkAction_s
+{
+  my_GObject_t parent;
+  void*        private_data;
+} my_GtkAction_t;
+
 typedef struct my_GtkActionClass_s
 {
   my_GObjectClass_t   parent_class;
@@ -324,11 +409,26 @@ typedef struct my_GtkActionClass_s
   void (*_gtk_reserved4) (void);
 } my_GtkActionClass_t;
 
+typedef struct my_GtkMisc2_s
+{
+  my_GtkWidget2_t  parent;
+  float           xalign;
+  float           yalign;
+  uint16_t        xpad;
+  uint16_t        ypad;
+} my_GtkMisc2_t;
+
 typedef struct my_GtkMisc2Class_s
 {
   my_GtkWidget2Class_t parent_class;
 } my_GtkMisc2Class_t;
 
+typedef struct my_GtkMisc3_s
+{
+  my_GtkWidget3_t parent;
+  void*           priv;
+} my_GtkMisc3_t;
+
 typedef struct my_GtkMisc3Class_s
 {
   my_GtkWidget3Class_t parent_class;
@@ -338,11 +438,30 @@ typedef struct my_GtkMisc3Class_s
   void (*_gtk_reserved4) (void);
 } my_GtkMisc3Class_t;
 
-typedef struct my_GtkMenuButtonClass_s
+typedef struct my_GtkLabel2_s
 {
-  my_GtkWidget3Class_t parent_class;
-  void (* activate) (void *self);
-}my_GtkMenuButtonClass_t;
+  my_GtkMisc2_t misc;
+  char*         label;
+  uint32_t      jtype            : 2;
+  uint32_t      wrap             : 1;
+  uint32_t      use_underline    : 1;
+  uint32_t      use_markup       : 1;
+  uint32_t      ellipsize        : 3;
+  uint32_t      single_line_mode : 1;
+  uint32_t      have_transform   : 1;
+  uint32_t      in_click         : 1;
+  uint32_t      wrap_mode        : 3;
+  uint32_t      pattern_set      : 1;
+  uint32_t      track_links      : 1;
+  uint32_t      mnemonic_keyval;
+  char*         text;
+  void*         attrs;  //PangoAttrList
+  void*         effective_attrs;  //PangoAttrList
+  void*         layout; //PangoLayout
+  void*         mnemonic_widget;  //GtkWidget
+  void*         mnemonic_window;  //GtkWindow
+  void*         select_info;  //GtkLabelSelectionInfo
+} my_GtkLabel2_t;
 
 typedef struct my_GtkLabel2Class_s
 {
@@ -356,6 +475,12 @@ typedef struct my_GtkLabel2Class_s
   void (*_gtk_reserved3) (void);
 } my_GtkLabel2Class_t;
 
+typedef struct my_GtkLabel3_s
+{
+  my_GtkMisc3_t misc;
+  void*         priv;
+} my_GtkLabel3_t;
+
 typedef struct my_GtkLabel3Class_s
 {
   my_GtkMisc3Class_t parent_class;
@@ -373,6 +498,12 @@ typedef struct my_GtkLabel3Class_s
   void (*_gtk_reserved8) (void);
 } my_GtkLabel3Class_t;
 
+typedef struct my_GtkTreeView2_s
+{
+  my_GtkContainer2_t  parent;
+  void*               priv;
+} my_GtkTreeView2_t;
+
 typedef struct my_GtkTreeView2Class_s
 {
   my_GtkContainer2Class_t parent_class;
@@ -399,6 +530,12 @@ typedef struct my_GtkTreeView2Class_s
   void (*_gtk_reserved4) (void);
 } my_GtkTreeView2Class_t;
 
+typedef struct my_GtkBin2_s
+{
+  my_GtkContainer2_t  container;
+  void*               child;  //GtkWidget
+} my_GtkBin2_t;
+
 typedef struct my_GtkBin2Class_s
 {
   my_GtkContainer2Class_t parent_class;
@@ -408,6 +545,12 @@ typedef struct my_GtkBin2Class_s
   void (*_gtk_reserved4) (void);
 } my_GtkBin2Class_t;
 
+typedef struct my_GtkBin3_s
+{
+  my_GtkContainer3_t  container;
+  void*               priv;
+} my_GtkBin3_t;
+
 typedef struct my_GtkBin3Class_s
 {
   my_GtkContainer3Class_t parent_class;
@@ -417,6 +560,49 @@ typedef struct my_GtkBin3Class_s
   void (*_gtk_reserved4) (void);
 } my_GtkBin3Class_t;
 
+typedef struct my_GtkWindow2_s
+{
+  my_GtkBin2_t  parent;
+  char*         title;
+  char*         wmclass_name;
+  char*         wmclass_class;
+  char*         wm_role;
+  void*         focus_widget; // GtkWidget
+  void*         default_widget; // GtkWidget
+  void*         transient_parent; // GtkWindow
+  void*         geometry_info;  // GtkWindowGeometryInfo
+  void*         frame;  // GdkWindow
+  void*         group;  // GtkWindowGroup
+  uint16_t      configure_request_count;
+  uint32_t      allow_shrink : 1;
+  uint32_t      allow_grow : 1;
+  uint32_t      configure_notify_received : 1;
+  uint32_t      need_default_position : 1;
+  uint32_t      need_default_size : 1;
+  uint32_t      position : 3;
+  uint32_t      type : 4;
+  uint32_t      has_user_ref_count : 1;
+  uint32_t      has_focus : 1;
+  uint32_t      modal : 1;
+  uint32_t      destroy_with_parent : 1;
+  uint32_t      has_frame : 1;
+  uint32_t      iconify_initially : 1;
+  uint32_t      stick_initially : 1;
+  uint32_t      maximize_initially : 1;
+  uint32_t      decorated : 1;
+  uint32_t      type_hint : 3;
+  uint32_t      gravity : 5;
+  uint32_t      is_active : 1;
+  uint32_t      has_toplevel_focus : 1;
+  uint32_t      frame_left;
+  uint32_t      frame_top;
+  uint32_t      frame_right;
+  uint32_t      frame_bottom;
+  uint32_t      keys_changed_handler;
+  int           mnemonic_modifier;
+  void*         screen; // GdkScreen
+} my_GtkWindow2_t;
+
 typedef struct my_GtkWindow2Class_s {
   my_GtkBin2Class_t parent_class;
   void (* set_focus)    (void* window, void* focus);
@@ -431,6 +617,12 @@ typedef struct my_GtkWindow2Class_s {
   void (*_gtk_reserved4) (void);
 } my_GtkWindow2Class_t;
 
+typedef struct my_GtkWindow3_s
+{
+  my_GtkBin3_t  bin;
+  void*         priv;
+} my_GtkWindow3_t;
+
 typedef struct my_GtkWindow3Class_s
 {
   my_GtkBin3Class_t parent_class;
@@ -444,11 +636,22 @@ typedef struct my_GtkWindow3Class_s
   void (* _gtk_reserved3) (void);
 }my_GtkWindow3Class_t;
 
+typedef struct my_GtkApplicationWindow_s
+{
+  my_GtkWindow3_t parent;
+  void*           priv;
+} my_GtkApplicationWindow_t;
+
 typedef struct my_GtkApplicationWindowClass_s
 {
   my_GtkWindow3Class_t parent_class;
 }my_GtkApplicationWindowClass_t;
 
+typedef struct my_GtkListBox_s
+{
+  my_GtkContainer3_t parent;
+} my_GtkListBox_t;
+
 typedef struct my_GtkListBoxClass_s
 {
   my_GtkContainer3Class_t parent_class;
@@ -465,6 +668,11 @@ typedef struct my_GtkListBoxClass_s
   void (* _gtk_reserved3) (void);
 }my_GtkListBoxClass_t;
 
+typedef struct my_GtkListBoxRow_s
+{
+  my_GtkBin3_t parent;
+} my_GtkListBoxRow_t;
+
 typedef struct my_GtkListBoxRowClass_s {
   my_GtkBin3Class_t parent_class;
   void (* activate) (void* row);
@@ -472,6 +680,23 @@ typedef struct my_GtkListBoxRowClass_s {
   void (* _gtk_reserved2) (void);
 }my_GtkListBoxRowClass_t;
 
+typedef struct my_GtkButton2_s
+{
+  my_GtkBin2_t  bin;
+  void*         event_window; // GdkWindow
+  char*         label_text;
+  uint32_t      activate_timeout;
+  uint32_t      constructed : 1;
+  uint32_t      in_button : 1;
+  uint32_t      button_down : 1;
+  uint32_t      relief : 2;
+  uint32_t      use_underline : 1;
+  uint32_t      use_stock : 1;
+  uint32_t      depressed : 1;
+  uint32_t      depress_on_activate : 1;
+  uint32_t      focus_on_click : 1;
+} my_GtkButton2_t;
+
 typedef struct my_GtkButton2Class_s {
   my_GtkBin2Class_t parent_class;
   void (* pressed)  (void *button);
@@ -486,6 +711,12 @@ typedef struct my_GtkButton2Class_s {
   void (*_gtk_reserved4) (void);
 } my_GtkButton2Class_t;
 
+typedef struct my_GtkButton3_s
+{
+  my_GtkBin3_t  bin;
+  void*         priv;
+} my_GtkButton3_t;
+
 typedef struct my_GtkButton3Class_s {
   my_GtkBin3Class_t parent_class;
   void (* pressed)  (void *button);
@@ -500,6 +731,14 @@ typedef struct my_GtkButton3Class_s {
   void (*_gtk_reserved4) (void);
 } my_GtkButton3Class_t;
 
+typedef struct my_GtkToggleButton2_s
+{
+  my_GtkButton2_t button;
+  uint32_t        active : 1;
+  uint32_t        draw_indicator : 1;
+  uint32_t        inconsistent : 1;
+} my_GtkToggleButton2_t;
+
 typedef struct my_GtkToggleButton2Class_s {
   my_GtkButton2Class_t parent_class;
   void (* toggled) (void* toggle_button);
@@ -509,6 +748,27 @@ typedef struct my_GtkToggleButton2Class_s {
   void (*_gtk_reserved4) (void);
 } my_GtkToggleButton2Class_t;
 
+typedef struct my_GtkToggleButton3_s
+{
+  my_GtkButton3_t parent;
+  void*           priv;
+} my_GtkToggleButton3_t;
+
+typedef struct my_GtkToggleButton3Class_s
+{
+  my_GtkButton3Class_t parent_class;
+  void (* toggled) (void* toggle_button);
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+} my_GtkToggleButton3Class_t;
+
+typedef struct my_GtkCheckButton2_s
+{
+  my_GtkToggleButton2_t parent;
+} my_GtkCheckButton2_t;
+
 typedef struct my_GtkCheckButton2Class_s {
   my_GtkToggleButton2Class_t parent_class;
   void (* draw_indicator) (void* check_button, void* area);
@@ -517,6 +777,40 @@ typedef struct my_GtkCheckButton2Class_s {
   void (*_gtk_reserved2) (void);
 } my_GtkCheckButton2Class_t;
 
+typedef struct my_GtkCheckButton3_s
+{
+  my_GtkToggleButton3_t parent;
+} my_GtkCheckButton3_t;
+
+typedef struct my_GtkCheckButton3Class_s {
+  my_GtkToggleButton3Class_t parent_class;
+  void (* draw_indicator) (void* check_button, void* area);
+  void (*_gtk_reserved0) (void);
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+} my_GtkCheckButton3Class_t;
+
+typedef struct my_GtkMenuButton3_s
+{
+  my_GtkToggleButton3_t parent;
+  void*                 priv;
+} my_GtkMenuButton3_t;
+
+typedef struct my_GtkMenuButton3Class_s
+{
+  my_GtkToggleButton3Class_t parent_class;
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+}my_GtkMenuButton3Class_t;
+
+typedef struct my_GtkComboBox2_s
+{
+  my_GtkBin2_t    parent;
+  void*           priv;
+} my_GtkComboBox2_t;
+
 typedef struct my_GtkComboBox2Class_s {
   my_GtkBin2Class_t parent_class;
   void (* changed)        (void* combo_box);
@@ -527,6 +821,52 @@ typedef struct my_GtkComboBox2Class_s {
   void (*_gtk_reserved4) (void);
 } my_GtkComboBox2Class_t;
 
+typedef struct my_GtkEntry2_s
+{
+  my_GtkWidget2_t   parent;
+  char*             text;
+  uint32_t          editable : 1;
+  uint32_t          visible  : 1;
+  uint32_t          overwrite_mode : 1;
+  uint32_t          in_drag : 1;
+  uint16_t          text_length;
+  uint16_t          text_max_length;
+  void*             text_area;  // GdkWindow
+  void*             im_context; // GtkIMContext
+  void*             popup_menu; // GtkWidget
+  int               current_pos;
+  int               selection_bound;
+  void*             cached_layout;  // PangoLayout
+  uint32_t          cache_includes_preedit : 1;
+  uint32_t          need_im_reset          : 1;
+  uint32_t          has_frame              : 1;
+  uint32_t          activates_default      : 1;
+  uint32_t          cursor_visible         : 1;
+  uint32_t          in_click               : 1;
+  uint32_t          is_cell_renderer       : 1;
+  uint32_t          editing_canceled       : 1;
+  uint32_t          mouse_cursor_obscured  : 1;
+  uint32_t          select_words           : 1;
+  uint32_t          select_lines           : 1;
+  uint32_t          resolved_dir           : 4;
+  uint32_t          truncate_multiline     : 1;
+  uint32_t          button;
+  uint32_t          blink_timeout;
+  uint32_t          recompute_idle;
+  int               scroll_offset;
+  int               ascent;
+  int               descent;
+  uint16_t          x_text_size;
+  uint16_t          x_n_bytes;
+  uint16_t          preedit_length;
+  uint16_t          preedit_cursor;
+  int               dnd_position;
+  int               drag_start_x;
+  int               drag_start_y;
+  uint32_t          invisible_char;
+  int               width_chars;
+} my_GtkEntry2_t;
+
 typedef struct my_GtkEntry2Class_s {
   my_GtkWidget2Class_t parent_class;
   void (* populate_popup)   (void* entry, void* menu);
@@ -544,6 +884,26 @@ typedef struct my_GtkEntry2Class_s {
   void (*_gtk_reserved2) (void);
 } my_GtkEntry2Class_t;
 
+typedef struct my_GtkSpinButton2_s
+{
+  my_GtkEntry2_t  entry;
+  void*           adjustment; // GtkAdjustment
+  void*           panel;  // GdkWindow
+  uint32_t        timer;
+  double          climb_rate;
+  double          timer_step;
+  int             update_policy;
+  uint32_t        in_child : 2;
+  uint32_t        click_child : 2;
+  uint32_t        button : 2;
+  uint32_t        need_timer : 1;
+  uint32_t        timer_calls : 3;
+  uint32_t        digits : 10;
+  uint32_t        numeric : 1;
+  uint32_t        wrap : 1;
+  uint32_t        snap_to_ticks : 1;
+} my_GtkSpinButton2_t;
+
 typedef struct my_GtkSpinButton2Class_s {
   my_GtkEntry2Class_t parent_class;
   int  (*input)  (void* spin_button, void* new_value);
@@ -556,8 +916,21 @@ typedef struct my_GtkSpinButton2Class_s {
   void (*_gtk_reserved3) (void);
 } my_GtkSpinButton2Class_t;
 
+typedef struct my_GtkProgress2_s
+{
+  my_GtkWidget2_t   widget;
+  void*             adjustment; // GtkAdjustment
+  void*             offscreen_pixmap; // GdkPixmap
+  char*             format;
+  float             x_align;
+  float             y_align;
+  uint32_t          show_text : 1;
+  uint32_t          activity_mode : 1;
+  uint32_t          use_text_format : 1;
+} my_GtkProgress2_t;
+
 typedef struct my_GtkProgress2Class_s {
-  my_GtkWidget2Class_t parent_class;
+  my_GtkWidget2Class_t parent;
   void (* paint)            (void* progress);
   void (* update)           (void* progress);
   void (* act_mode_enter)   (void* progress);
@@ -567,6 +940,22 @@ typedef struct my_GtkProgress2Class_s {
   void (*_gtk_reserved4) (void);
 } my_GtkProgress2Class_t;
 
+typedef struct my_GtkProgressBar2_s
+{
+  my_GtkProgress2_t parent;
+  int               bar_style;
+  int               orientation;
+  uint32_t          blocks;
+  int               in_block;
+  int               activity_pos;
+  uint32_t          activity_step;
+  uint32_t          activity_blocks;
+  double            pulse_fraction;
+  uint32_t          activity_dir : 1;
+  uint32_t          ellipsize : 3;
+  uint32_t          dirty : 1;
+} my_GtkProgressBar2_t;
+
 typedef struct my_GtkProgressBar2Class_s {
   my_GtkProgress2Class_t parent_class;
   void (*_gtk_reserved1) (void);
@@ -575,11 +964,38 @@ typedef struct my_GtkProgressBar2Class_s {
   void (*_gtk_reserved4) (void);
 } my_GtkProgressBar2Class_t;
 
+typedef struct my_GtkFrame2_s
+{
+  my_GtkBin2_t      bin;
+  void*             label_widget; // GtkWidget
+  int16_t           shadow_type;
+  float             label_xalign;
+  float             label_yalign;
+  my_GdkRectangle_t child_allocation;
+} my_GtkFrame2_t;
+
 typedef struct my_GtkFrame2Class_s {
   my_GtkBin2Class_t parent_class;
   void (*compute_child_allocation) (void* frame, void* allocation);
 } my_GtkFrame2Class_t;
 
+typedef struct my_GtkMenuShell2_s
+{
+  my_GtkContainer2_t  container;
+  void*               children; // GList
+  void*               active_menu_item; // GtkWidget
+  void*               parent_menu_shell;  // GtkWidget
+  uint32_t            button;
+  uint32_t            activate_time;
+  uint32_t            active : 1;
+  uint32_t            have_grab : 1;
+  uint32_t            have_xgrab : 1;
+  uint32_t            ignore_leave : 1;
+  uint32_t            menu_flag : 1;
+  uint32_t            ignore_enter : 1;
+  uint32_t            keyboard_mode : 1;
+} my_GtkMenuShell2_t;
+
 typedef struct my_GtkMenuShell2Class_s {
   my_GtkContainer2Class_t parent_class;
   void (*deactivate)       (void* menu_shell);
@@ -595,6 +1011,11 @@ typedef struct my_GtkMenuShell2Class_s {
   void (*_gtk_reserved2) (void);
 } my_GtkMenuShell2Class_t;
 
+typedef struct my_GtkMenuBar2_s
+{
+  my_GtkMenuShell2_t  parent;
+} my_GtkMenuBar2_t;
+
 typedef struct my_GtkMenuBar2Class_s {
   my_GtkMenuShell2Class_t parent_class;
   void (*_gtk_reserved1) (void);
@@ -603,6 +1024,58 @@ typedef struct my_GtkMenuBar2Class_s {
   void (*_gtk_reserved4) (void);
 } my_GtkMenuBar2Class_t;
 
+typedef struct my_GtkTextView2_s
+{
+  my_GtkContainer2_t    parent;
+  void*                 layout; // struct _GtkTextLayout
+  void*                 buffer; // GtkTextBuffer
+  uint32_t              selection_drag_handler;
+  uint32_t              scroll_timeout;
+  int                   pixels_above_lines;
+  int                   pixels_below_lines;
+  int                   pixels_inside_wrap;
+  int                   wrap_mode;
+  int                   justify;
+  int                   left_margin;
+  int                   right_margin;
+  int                   indent;
+  void*                 tabs; // PangoTabArray
+  uint32_t              editable : 1;
+  uint32_t              overwrite_mode : 1;
+  uint32_t              cursor_visible : 1;
+  uint32_t              need_im_reset : 1;
+  uint32_t              accepts_tab : 1;
+  uint32_t              width_changed : 1;
+  uint32_t              onscreen_validated : 1;
+  uint32_t              mouse_cursor_obscured : 1;
+  void*                 text_window;  // GtkTextWindow
+  void*                 left_window;  // GtkTextWindow
+  void*                 right_window; // GtkTextWindow
+  void*                 top_window; // GtkTextWindow
+  void*                 bottom_window;  // GtkTextWindow
+  void*                 hadjustment;  // GtkAdjustment
+  void*                 vadjustment;  // GtkAdjustment
+  int                   xoffset;
+  int                   yoffset;
+  int                   width;
+  int                   height;
+  int                   virtual_cursor_x;
+  int                   virtual_cursor_y;
+  void*                 first_para_mark;  // GtkTextMark
+  int                   first_para_pixels;
+  void*                 dnd_mark; // GtkTextMark
+  uint32_t              blink_timeout;
+  uint32_t              first_validate_idle;
+  uint32_t              incremental_validate_idle;
+  void*                 im_context; // GtkIMContext
+  void*                 popup_menu; // GtkWidget
+  int                   drag_start_x;
+  int                   drag_start_y;
+  void*                 children; // GSList
+  void*                 pending_scroll; // GtkTextPendingScroll
+  int                   pending_place_cursor_button;
+} my_GtkTextView2_t;
+
 typedef struct my_GtkTextView2Class_s {
   my_GtkContainer2Class_t parent_class;
   void (* set_scroll_adjustments)   (void* text_view, void* hadjustment, void* vadjustment);
@@ -627,6 +1100,12 @@ typedef struct my_GtkTextView2Class_s {
   void (*_gtk_reserved7) (void);
 } my_GtkTextView2Class_t;
 
+typedef struct my_GtkTextView3_s
+{
+  my_GtkContainer3_t  parent;
+  void*               priv;
+} my_GtkTextView3_t;
+
 typedef struct my_GtkTextView3Class_s {
   my_GtkContainer3Class_t parent_class;
   void (* populate_popup)           (void* text_view, void* menu);
@@ -649,6 +1128,12 @@ typedef struct my_GtkTextView3Class_s {
   void (*_gtk_reserved4) (void);
 } my_GtkTextView3Class_t;
 
+typedef struct my_GtkGrid3_s
+{
+  my_GtkContainer3_t  parent;
+  void*               priv;
+} my_GtkGrid3_t;
+
 typedef struct my_GtkGrid3Class_s {
   my_GtkContainer3Class_t parent_class;
   void (* _gtk_reserved1) (void);
@@ -661,6 +1146,11 @@ typedef struct my_GtkGrid3Class_s {
   void (* _gtk_reserved8) (void);
 }my_GtkGrid3Class_t;
 
+typedef struct my_GtkEventController_s
+{
+  my_GObject_t parent;
+} my_GtkEventController_t;
+
 typedef struct my_GtkEventControllerClass_s {
   my_GObjectClass_t parent_class;
   void (* set_widget)   (void *controller, void *widget);
@@ -672,6 +1162,11 @@ typedef struct my_GtkEventControllerClass_s {
   void* padding[10];
 }my_GtkEventControllerClass_t;
 
+typedef struct my_GtkGesture_s
+{
+  my_GtkEventController_t parent;
+} my_GtkGesture_t;
+
 typedef struct my_GtkGestureClass_s {
   my_GtkEventControllerClass_t parent_class;
   int (* check)  (void *gesture);
@@ -683,11 +1178,21 @@ typedef struct my_GtkGestureClass_s {
   void* padding[10];
 }my_GtkGestureClass_t;
 
+typedef struct my_GtkGestureSingle_s
+{
+  my_GtkGesture_t parent;
+} my_GtkGestureSingle_t;
+
 typedef struct my_GtkGestureSingleClass_s {
   my_GtkGestureClass_t parent_class;
   void* padding[10];
 }my_GtkGestureSingleClass_t;
 
+typedef struct my_GtkGestureLongPress_s
+{
+  my_GtkGestureSingle_t parent;
+} my_GtkGestureLongPress_t;
+
 typedef struct my_GtkGestureLongPressClass_s {
   my_GtkGestureSingleClass_t parent_class;
   void (* pressed) (void *gesture, double x, double y);
@@ -696,22 +1201,52 @@ typedef struct my_GtkGestureLongPressClass_s {
   void* padding[10];
 }my_GtkGestureLongPressClass_t;
 
+typedef struct my_MetaFrames2_s
+{
+  my_GtkWindow2_t parent; // to be checked (is MetaFrame2 still usefull?)
+} my_MetaFrames2_t;
+
 typedef struct my_MetaFrames2Class_s
 {
   my_GtkWindow2Class_t parent_class;
 
 } my_MetaFrames2Class_t;
 
+typedef struct my_GtkTable2_s
+{
+  my_GtkContainer2_t  container;
+  void*               children; // GList
+  void*               rows; // GtkTableRowCol
+  void*               cols; // GtkTableRowCol
+  uint16_t            nrows;
+  uint16_t            ncols;
+  uint16_t            column_spacing;
+  uint16_t            row_spacing;
+  uint32_t            homogeneous : 1;
+} my_GtkTable2_t;
+
 typedef struct my_GtkTable2Class_s
 {
   my_GtkContainer2Class_t parent_class;
 } my_GtkTable2Class_t;
 
+typedef struct my_GtkFixed2_s
+{
+  my_GtkContainer2_t  parent;
+  void*               children; // GList
+} my_GtkFixed2_t;
+
 typedef struct my_GtkFixed2Class_s
 {
   my_GtkContainer2Class_t parent_class;
 } my_GtkFixed2Class_t;
 
+typedef struct my_GDBusObjectManagerClient_s
+{
+  my_GObject_t  parent;
+  void*         priv;
+} my_GDBusObjectManagerClient_t;
+
 typedef struct my_GDBusObjectManagerClientClass_s
 {
   my_GObjectClass_t parent_class;
@@ -720,6 +1255,17 @@ typedef struct my_GDBusObjectManagerClientClass_s
   void* padding[8];
 } my_GDBusObjectManagerClientClass_t;
 
+typedef struct my_AtkObject_s
+{
+  my_GObject_t  parent;
+  char*         description;
+  char*         name;
+  void*         accessible_parent;  // AtkObject
+  int           role;
+  void*         relation_set; // AtkRelationSet
+  int           layer;
+} my_AtkObject_t;
+
 typedef struct my_AtkObjectClass_s
 {
   my_GObjectClass_t parent;
@@ -752,6 +1298,11 @@ typedef struct my_AtkObjectClass_s
   void*  pad1;
 } my_AtkObjectClass_t;
 
+typedef struct my_AtkUtil_s
+{
+  my_GObject_t parent;
+} my_AtkUtil_t;
+
 typedef struct my_AtkUtilClass_s
 {
    my_GObjectClass_t parent;
@@ -764,6 +1315,25 @@ typedef struct my_AtkUtilClass_s
    void*    (* get_toolkit_version)          (void);
 } my_AtkUtilClass_t;
 
+typedef union my_GMutex_s
+{
+  void*     p;
+  uint32_t  i[2];
+} my_GMutex_t;
+
+typedef struct my_GstObject_s
+{
+  my_GInitiallyUnowned_t  parent;
+  my_GMutex_t             lock;
+  char*                   name;
+  void*                   _parent;  // GstObject
+  uint32_t                flags;
+  void*                   control_bindings; // GList
+  uint64_t                control_rate;
+  uint64_t                last_sync;
+  void*                   _gst_reserved;
+} my_GstObject_t;
+
 typedef struct my_GstObjectClass_s {
   my_GInitiallyUnownedClass_t parent;
   const char*   path_string_separator;
@@ -771,13 +1341,36 @@ typedef struct my_GstObjectClass_s {
   void*        _gst_reserved[4];
 } my_GstObjectClass_t;
 
-typedef struct my_GstAllocatorClass_s {
+typedef struct my_GstAllocator_s
+{
+  my_GstObject_t        parent;
+  const char*           mem_type;
+  void*(*mem_map)       (void* mem, size_t maxsize, int flags);
+  void (*mem_unmap)     (void* mem);
+  void*(*mem_copy)      (void* mem, ssize_t offset, ssize_t size);
+  void*(*mem_share)     (void* mem, ssize_t offset, ssize_t size);
+  int  (*mem_is_span)   (void* mem1, void* mem2, void* offset);
+  void*(*mem_map_full)  (void* mem, void* info, size_t maxsize);
+  void (*mem_unmap_full)(void* mem, void* info);
+  void*                 _gst_reserved[4 - 2];
+  void*                 priv;
+} my_GstAllocator_t;
+
+typedef struct my_GstAllocatorClass_s
+{
   my_GstObjectClass_t parent;
   void*     (*alloc)      (void *allocator, size_t size, void *params);
   void      (*free)       (void *allocator, void *memory);
   void*    _gst_reserved[4];
 } my_GstAllocatorClass_t;
 
+typedef struct my_GstTaskPool_s
+{
+  my_GstObject_t      parent;
+  void*               pool; // GThreadPool
+  void*               _gst_reserved[4];
+} my_GstTaskPool_t;
+
 typedef struct my_GstTaskPoolClass_s {
   my_GstObjectClass_t parent_class;
   void      (*prepare)  (void* pool, void* error);
@@ -788,6 +1381,44 @@ typedef struct my_GstTaskPoolClass_s {
   void*     _gst_reserved[4-1];
 } my_GstTaskPoolClass_t;
 
+typedef struct my_GCond_s
+{
+  void*     p;
+  uint32_t  i[2];
+} my_GCond_t;
+
+typedef struct my_GRecMutex_s
+{
+  void*     p;
+  uint32_t  i[2];
+} my_GRecMutex_t;
+
+typedef struct my_GstElement_s
+{
+  my_GstObject_t        parent;
+  my_GRecMutex_t        state_lock;
+  my_GCond_t            state_cond;
+  uint32_t              state_cookie;
+  int                   target_state;
+  int                   current_state;
+  int                   next_state;
+  int                   pending_state;
+  int                   last_return;
+  void*                 bus;  // GstBus
+  void*                 clock;  // GstClock
+  int64_t               base_time;
+  uint64_t              start_time;
+  uint16_t              numpads;
+  void*                 pads; //GstClock
+  uint16_t              numsrcpads;
+  void*                 srcpads;  //GstClock
+  uint16_t              numsinkpads;
+  void*                 sinkpads; //GstClock
+  uint32_t              pads_cookie;
+  void*                 contexts; //GstClock
+  void*                 _gst_reserved[4-1];
+} my_GstElement_t;
+
 typedef struct my_GstElementClass_s {
   my_GstObjectClass_t   parent_class;
   void*                 metadata;
@@ -814,6 +1445,22 @@ typedef struct my_GstElementClass_s {
   void* _gst_reserved[20-2];
 } my_GstElementClass_t;
 
+typedef struct my_GstBin_s {
+  my_GstElement_t     parent;
+  int                 numchildren;
+  void*               children; // GList
+  uint32_t            children_cookie;
+  void*               child_bus;  // GstBus
+  void*               messages; // GList
+  int                 polling;
+  int                 state_dirty;
+  int                 clock_dirty;
+  void*               provided_clock; // GstClock
+  void*               clock_provider; // GstElement
+  void*               priv;
+  void*               _gst_reserved[4];
+} my_GstBin_t;
+
 typedef struct my_GstBinClass_s {
   my_GstElementClass_t parent_class;
   void* pool;
@@ -828,6 +1475,34 @@ typedef struct my_GstBinClass_s {
   void* _gst_reserved[4-2];
 } my_GstBinClass_t;
 
+typedef struct my_GstSegment_s
+{
+  int       flags;
+  double    rate;
+  double    applied_rate;
+  int       format;
+  uint64_t  base;
+  uint64_t  offset;
+  uint64_t  start;
+  uint64_t  stop;
+  uint64_t  time;
+  uint64_t  position;
+  uint64_t  duration;
+  void*     _gst_reserved[4];
+} my_GstSegment_t;
+
+typedef struct my_GstBaseTransform_s
+{
+  my_GstElement_t     parent;
+  void*               sinkpad;  // GstPad
+  void*               srcpad; // GstPad
+  int                 have_segment;
+  my_GstSegment_t     segment;
+  void*               queued_buf; // GstBuffer
+  void*               priv;
+  void*               _gst_reserved[20-1];
+} my_GstBaseTransform_t;
+
 typedef struct my_GstBaseTransformClass_s {
   my_GstElementClass_t parent_class;
   int passthrough_on_same_caps;
@@ -857,6 +1532,18 @@ typedef struct my_GstBaseTransformClass_s {
   void* _gst_reserved[20-2];
 } my_GstBaseTransformClass_t;
 
+typedef struct my_GstVideoDecoder_s
+{
+  my_GstElement_t parent;
+  void*           sinkpad;  // GstPad
+  void*           srcpad; // GstPad
+  my_GRecMutex_t  stream_lock;
+  my_GstSegment_t input_segment;
+  my_GstSegment_t output_segment;
+  void*           priv;
+  void*           padding[20];
+} my_GstVideoDecoder_t;
+
 typedef struct my_GstVideoDecoderClass_s {
   my_GstElementClass_t parent_class;
   int      (*open)           (void* decoder);
@@ -883,6 +1570,18 @@ typedef struct my_GstVideoDecoderClass_s {
   void* padding[20-7];
 } my_GstVideoDecoderClass_t;
 
+typedef struct my_GstVideoEncoder_s
+{
+  my_GstElement_t   parent;
+  void*             sinkpad;  // GstPad
+  void*             srcpad; // GstPad
+  my_GRecMutex_t    stream_lock;
+  my_GstSegment_t   input_segment;
+  my_GstSegment_t   output_segment;
+  void*             priv;
+  void*             padding[20];
+} my_GstVideoEncoder_t;
+
 typedef struct my_GstVideoEncoderClass_s {
   my_GstElementClass_t  parent_class;
   int      (*open)         (void* encoder);
@@ -907,6 +1606,31 @@ typedef struct my_GstVideoEncoderClass_s {
   void*  _gst_reserved[20-4];
 } my_GstVideoEncoderClass_t;
 
+typedef struct my_GstBaseSink_s
+{
+  my_GstElement_t     parent;
+  void*               sinkpad;  // GstPad
+  int                 pad_mode;
+  uint64_t            offset;
+  int                 can_activate_pull;
+  int                 can_activate_push;
+  my_GMutex_t         preroll_lock;
+  my_GCond_t          preroll_cond;
+  int                 eos;
+  int                 need_preroll;
+  int                 have_preroll;
+  int                 playing_async;
+  int                 have_newsegment;
+  my_GstSegment_t     segment;
+  int                 clock_id;
+  int                 sync;
+  int                 flushing;
+  int                 running;
+  int64_t             max_lateness;
+  void*               priv;
+  void*               _gst_reserved[20];
+} my_GstBaseSink_t;
+
 typedef struct my_GstBaseSinkClass_s {
   my_GstElementClass_t parent_class;
   void*         (*get_caps)             (void* sink, void* filter);
@@ -930,6 +1654,14 @@ typedef struct my_GstBaseSinkClass_s {
   void*       _gst_reserved[20];
 } my_GstBaseSinkClass_t;
 
+typedef struct my_GstVideoSink_s
+{
+  my_GstBaseSink_t  parent;
+  int               width, height;
+  void*             priv;
+  void*             _gst_reserved[4];
+} my_GstVideoSink_t;
+
 typedef struct my_GstVideoSinkClass_s
 {
   my_GstBaseSinkClass_t parent_class;
@@ -938,6 +1670,17 @@ typedef struct my_GstVideoSinkClass_s
   void* _gst_reserved[4-1];
 } my_GstVideoSinkClass_t;
 
+typedef struct my_GstGLBaseFilter_s
+{
+  my_GstBaseTransform_t   parent;
+  void*                   display;  // GstGLDisplay
+  void*                   context;  // GstGLContext
+  void*                   in_caps;  // GstCaps
+  void*                   out_caps; // GstCaps
+  void*                   _padding[4];
+  void*                   priv;
+} my_GstGLBaseFilter_t;
+
 typedef struct my_GstGLBaseFilterClass_s
 {
   my_GstBaseTransformClass_t parent_class;
@@ -948,6 +1691,63 @@ typedef struct my_GstGLBaseFilterClass_s
   void* _padding[4];
 } my_GstGLBaseFilterClass_t;
 
+typedef struct my_GstVideoColorimetry_t
+{
+  int range;
+  int matrix;
+  int transfer;
+  int primaries;
+} my_GstVideoColorimetry_t;
+
+typedef struct my_GstVideoInfo_s
+{
+  void*                     finfo;  // const GstVideoFormatInfo
+  int                       interlace_mode;
+  int                       flags;
+  int                       width;
+  int                       height;
+  size_t                    size;
+  int                       views;
+  int                       chroma_site;
+  my_GstVideoColorimetry_t  colorimetry;
+  int                       par_n;
+  int                       par_d;
+  int                       fps_n;
+  int                       fps_d;
+  size_t                    offset[4];
+  int                       stride[4];
+  union {
+    struct {
+      int   multiview_mode;
+      int   multiview_flags;
+      int   field_order;
+    } abi;
+    void* _gst_reserved[4];
+  } ABI;
+} my_GstVideoInfo_t;
+
+typedef struct my_GstGLFilter_s
+{
+  my_GstGLBaseFilter_t    parent;
+  my_GstVideoInfo_t       in_info;
+  my_GstVideoInfo_t       out_info;
+  int                     in_texture_target;
+  int                     out_texture_target;
+  void*                   out_caps; // GstCaps
+  void*                   fbo;  // GstGLFramebuffer
+  int                     gl_result;
+  void*                   inbuf;  // GstBuffer
+  void*                   outbuf; // GstBuffer
+  void*                   default_shader; // GstGLShader
+  int                     valid_attributes;
+  uint32_t                vao;
+  uint32_t                vbo_indices;
+  uint32_t                vertex_buffer;
+  int                     draw_attr_position_loc;
+  int                     draw_attr_texture_loc;
+  void*                   _padding[4];
+} my_GstGLFilter_t;
+
 typedef struct my_GstGLFilterClass_s
 {
   my_GstGLBaseFilterClass_t parent_class;
@@ -959,6 +1759,14 @@ typedef struct my_GstGLFilterClass_s
   void*    _padding[4];
 } my_GstGLFilterClass_t;
 
+typedef struct my_GstAggregator_s
+{
+  my_GstElement_t   parent;
+  void*             srcpad; // GstPad
+  void*             priv;
+  void*             _gst_reserved[20];
+} my_GstAggregator_t;
+
 typedef struct my_GstAggregatorClass_s {
   my_GstElementClass_t   parent_class;
   int       (*flush)                (void* self);
@@ -987,6 +1795,14 @@ typedef struct my_GstAggregatorClass_s {
   void*      _gst_reserved[20-5];
 } my_GstAggregatorClass_t;
 
+typedef struct my_GstVideoAggregator_s
+{
+  my_GstAggregator_t  aggregator;
+  my_GstVideoInfo_t   info;
+  void*               priv;
+  void*               _gst_reserved[20];
+} my_GstVideoAggregator_t;
+
 typedef struct my_GstVideoAggregatorClass_s
 {
   my_GstAggregatorClass_t parent_class;
@@ -997,6 +1813,72 @@ typedef struct my_GstVideoAggregatorClass_s
   void*      _gst_reserved[20];
 } my_GstVideoAggregatorClass_t;
 
+typedef struct my_GHookList_s
+{
+  unsigned long     seq_id;
+  uint32_t          hook_size : 16;
+  uint32_t          is_setup : 1;
+  void*             hooks;  // GHook
+  void*             dummy3;
+  void (*finalize_hook) (void* hook_list, void* hook);
+  void*             dummy[2];
+} my_GHookList_t;
+
+typedef struct my_GstPad_s
+{
+  my_GstObject_t      parent;
+  void*               element_private;
+  void*               padtemplate;  // GstPadTemplate
+  int                 direction;
+  my_GRecMutex_t      stream_rec_lock;
+  void*               task; // GstTask
+  my_GCond_t          block_cond;
+  my_GHookList_t      probes;
+  int                 mode;
+  int     (*activatefunc)       (void* pad, void* parent);
+  void*               activatedata;
+  void    (*activatenotify)     (void* a);
+  int     (*activatemodefunc)   (void* pad, void* parent, int mode, int active);
+  void*               activatemodedata;
+  void    (*activatemodenotify) (void* a);
+  void*                peer;  // GstPad
+  int     (*linkfunc)           (void* pad, void* parent, void* peer);
+  void*               linkdata;
+  void    (*linknotify)         (void* a);
+  void    (*unlinkfunc)         (void* pad, void* parent);
+  void*               unlinkdata;
+  void    (*unlinknotify)       (void* a);
+  int     (*chainfunc)          (void* pad, void* parent, void* buffer);
+  void*               chaindata;
+  void    (*chainnotify)        (void* a);
+  int     (*chainlistfunc)      (void* pad, void* parent, void* list);
+  void*               chainlistdata;
+  void    (*chainlistnotify)    (void* a);
+  int     (*getrangefunc)       (void* pad, void* parent, uint64_t offset, uint32_t length, void* buffer);
+  void*               getrangedata;
+  void    (*getrangenotify)     (void* a);
+  int     (*eventfunc)          (void* pad, void* parent, void* event);
+  void*               eventdata;
+  void    (*eventnotify)        (void* a);
+  int64_t             offset;
+  int     (*queryfunc)          (void* pad, void* parent, void* query);
+  void*               querydata;
+  void    (*querynotify)        (void* a);
+  void*   (*iterintlinkfunc)    (void* pad, void* parent);
+  void*               iterintlinkdata;
+  void    (*iterintlinknotify)  (void* a);
+  int                 num_probes;
+  int                 num_blocked;
+  void*               priv;
+  union {
+    void* _gst_reserved[4];
+    struct {
+      int    last_flowret;
+      int (*eventfullfunc) (void* pad, void* parent, void* event);
+    } abi;
+  } ABI;
+} my_GstPad_t;
+
 typedef struct my_GstPadClass_s {
   my_GstObjectClass_t        parent_class;
   void       (*linked)       (void* pad, void* peer);
@@ -1004,6 +1886,14 @@ typedef struct my_GstPadClass_s {
   void* _gst_reserved[4];
 } my_GstPadClass_t;
 
+typedef struct my_GstAggregatorPad_s
+{
+  my_GstPad_t     parent;
+  my_GstSegment_t segment;
+  void*           priv;
+  void*           _gst_reserved[4];
+} my_GstAggregatorPad_t;
+
 typedef struct my_GstAggregatorPadClass_s
 {
   my_GstPadClass_t   parent_class;
@@ -1012,6 +1902,14 @@ typedef struct my_GstAggregatorPadClass_s
   void*      _gst_reserved[20];
 } my_GstAggregatorPadClass_t;
 
+typedef struct my_GstVideoAggregatorPad_s
+{
+  my_GstAggregatorPad_t parent;
+  my_GstVideoInfo_t     info;
+  void*                 priv;
+  void*                 _gst_reserved[4];
+} my_GstVideoAggregatorPad_t;
+
 typedef struct my_GstVideoAggregatorPadClass_s
 {
   my_GstAggregatorPadClass_t parent_class;
@@ -1023,6 +1921,29 @@ typedef struct my_GstVideoAggregatorPadClass_s
   void*   _gst_reserved[20-2];
 } my_GstVideoAggregatorPadClass_t;
 
+typedef struct my_GstBaseSrc_s
+{
+  my_GstElement_t parent;
+  void*           srcpad; // GstPad
+  my_GMutex_t     live_lock;
+  my_GCond_t      live_cond;
+  int             is_live;
+  int             live_running;
+  uint32_t        blocksize;
+  int             can_activate_push;
+  int             random_access;
+  int             clock_id;
+  my_GstSegment_t segment;
+  int             need_newsegment;
+  int             num_buffers;
+  int             num_buffers_left;
+  int             typefind;
+  int             running;
+  void*           pending_seek; // GstEvent
+  void*           priv;
+  void*           _gst_reserved[20];
+} my_GstBaseSrc_t;
+
 typedef struct my_GstBaseSrcClass_s {
   my_GstElementClass_t parent_class;
   void*      (*get_caps)              (void* src, void* filter);
@@ -1047,6 +1968,12 @@ typedef struct my_GstBaseSrcClass_s {
   void*       _gst_reserved[20];
 } my_GstBaseSrcClass_t;
 
+typedef struct my_GstPushSrc_s
+{
+  my_GstBaseSrc_t parent;
+  void*           _gst_reserved[4];
+} my_GstPushSrc_t;
+
 typedef struct my_GstPushSrcClass_s {
   my_GstBaseSrcClass_t parent_class;
   int (*create) (void* src, void* buf);
@@ -1055,6 +1982,18 @@ typedef struct my_GstPushSrcClass_s {
   void* _gst_reserved[4];
 } my_GstPushSrcClass_t;
 
+typedef struct my_GstGLBaseSrc_s
+{
+  my_GstPushSrc_t   parent;
+  void*             display;  // GstGLDisplay
+  void*             context;  // GstGLContext
+  my_GstVideoInfo_t out_info;
+  void*             out_caps; // GstCaps
+  uint64_t          running_time;
+  void*             _padding[4];
+  void*             priv;
+} my_GstGLBaseSrc_t;
+
 typedef struct my_GstGLBaseSrcClass_s {
   my_GstPushSrcClass_t parent_class;
   int supported_gl_api;
@@ -1064,6 +2003,18 @@ typedef struct my_GstGLBaseSrcClass_s {
   void*     _padding[4];
 } my_GstGLBaseSrcClass_t;
 
+typedef struct my_GstAudioDecoder_s
+{
+  my_GstElement_t     parent;
+  void*               sinkpad;  // GstPad
+  void*               srcpad; // GstPad
+  my_GRecMutex_t      stream_lock;
+  my_GstSegment_t     input_segment;
+  my_GstSegment_t     output_segment;
+  void*               priv;
+  void*               _gst_reserved[20];
+} my_GstAudioDecoder_t;
+
 typedef struct my_GstAudioDecoderClass_s
 {
   my_GstElementClass_t parent_class;
@@ -1088,6 +2039,14 @@ typedef struct my_GstAudioDecoderClass_s
   void*   _gst_reserved[20 - 4];
 } my_GstAudioDecoderClass_t;
 
+typedef struct my_GstVideoFilter_s {
+  my_GstBaseTransform_t parent;
+  int                   negotiated;
+  my_GstVideoInfo_t     in_info;
+  my_GstVideoInfo_t     out_info;
+  void*                 _gst_reserved[4];
+} my_GstVideoFilter_t;
+
 typedef struct my_GstVideoFilterClass_s {
   my_GstBaseTransformClass_t parent_class;
   int      (*set_info)           (void* filter, void* incaps, void* in_info, void* outcaps, void* out_info);
@@ -1096,6 +2055,12 @@ typedef struct my_GstVideoFilterClass_s {
   void* _gst_reserved[4];
 } my_GstVideoFilterClass_t;
 
+typedef struct my_GDBusProxy_s
+{
+  my_GObject_t  parent;
+  void*         priv;
+} my_GDBusProxy_t;
+
 typedef struct my_GDBusProxyClass_s {
   my_GObjectClass_t parent_class;
   void (*g_properties_changed) (void* proxy, void* changed_properties, const char* const* invalidated_properties);
@@ -1174,7 +2139,6 @@ void FiniGTKClass(void);
 #define GTKCLASSES()                \
 GTKCLASS(GObject)                   \
 GTKCLASS(GInitiallyUnowned)         \
-GTKCLASS(GamesScoresImporter)       \
 GTKCLASS(GApplication)              \
 GTKCLASS(GtkApplication)            \
 GTKCLASS(GtkObject)                 \
@@ -1201,7 +2165,10 @@ GTKCLASS(GtkButton2)                \
 GTKCLASS(GtkButton3)                \
 GTKCLASS(GtkComboBox2)              \
 GTKCLASS(GtkToggleButton2)          \
+GTKCLASS(GtkToggleButton3)          \
+GTKCLASS(GtkMenuButton3)            \
 GTKCLASS(GtkCheckButton2)           \
+GTKCLASS(GtkCheckButton3)           \
 GTKCLASS(GtkEntry2)                 \
 GTKCLASS(GtkSpinButton2)            \
 GTKCLASS(GtkProgress2)              \
@@ -1263,6 +2230,9 @@ void unwrapGTKInterface(void* cl, size_t type);
 void* wrapCopyGTKInterface(void* cl, size_t type);
 void* unwrapCopyGTKInterface(void* iface, size_t type);
 
+void unwrapGTKInstance(void* cl, size_t type);
+void bridgeGTKInstance(void* cl, size_t type);
+
 void addRegisteredClass(size_t klass, char* name);
 
 typedef struct my_signal_s {
diff --git a/src/tools/gtkclass.c b/src/tools/gtkclass.c
index 35f37bd8..8e9ea13f 100644
--- a/src/tools/gtkclass.c
+++ b/src/tools/gtkclass.c
@@ -298,6 +298,15 @@ static void bridgeGObjectClass(my_GObjectClass_t* class)
 }
 #undef SUPERGO
 
+// unwrap (and use callback if not a native call anymore)
+static void unwrapGObjectInstance(my_GObject_t* class)
+{
+}
+// autobridge
+static void bridgeGObjectInstance(my_GObject_t* class)
+{
+}
+#undef SUPERGO
 // ----- GInitiallyUnownedClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GInitiallyUnowned, constructor, void*, (size_t type, uint32_t n_construct_properties, void* construct_properties), "Lup", type, n_construct_properties, construct_properties);
@@ -342,38 +351,13 @@ static void bridgeGInitiallyUnownedClass(my_GInitiallyUnownedClass_t* class)
 }
 #undef SUPERGO
 
-// ----- GamesScoresImporterClass ------
-// wrapper x86 -> natives of callbacks
-WRAPPER(GamesScoresImporter, importOldScores, void, (void *self, void* context, void* new_scores_dir, void *error), "pppp", self, context, new_scores_dir, error);
-
-#define SUPERGO() \
-    GO(importOldScores, vFpppp);
-
-// wrap (so bridge all calls, just in case)
-static void wrapGamesScoresImporterClass(my_GamesScoresImporterClass_t* class)
+static void unwrapGInitiallyUnownedInstance(my_GInitiallyUnowned_t* class)
 {
-    wrapGObjectClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GamesScoresImporter (W, class->A)
-    SUPERGO()
-    #undef GO
-}
-// unwrap (and use callback if not a native call anymore)
-static void unwrapGamesScoresImporterClass(my_GamesScoresImporterClass_t* class)
-{
-    unwrapGObjectClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GamesScoresImporter (class->A)
-    SUPERGO()
-    #undef GO
 }
 // autobridge
-static void bridgeGamesScoresImporterClass(my_GamesScoresImporterClass_t* class)
+static void bridgeGInitiallyUnownedInstance(my_GInitiallyUnowned_t* class)
 {
-    bridgeGObjectClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GamesScoresImporter (W, class->A)
-    SUPERGO()
-    #undef GO
 }
-#undef SUPERGO
 
 // ----- GApplicationClass ------
 // wrapper x86 -> natives of callbacks
@@ -413,6 +397,7 @@ WRAPPER(GApplication, name_lost, void, (void* application), "p", application);
 // wrap (so bridge all calls, just in case)
 static void wrapGApplicationClass(my_GApplicationClass_t* class)
 {
+    wrapGObjectClass(&class->parent_class);
     #define GO(A, W) class->A = reverse_##A##_GApplication (W, class->A)
     SUPERGO()
     #undef GO
@@ -420,6 +405,7 @@ static void wrapGApplicationClass(my_GApplicationClass_t* class)
 // unwrap (and use callback if not a native call anymore)
 static void unwrapGApplicationClass(my_GApplicationClass_t* class)
 {
+    unwrapGObjectClass(&class->parent_class);
     #define GO(A, W)   class->A = find_##A##_GApplication (class->A)   //SUPERGO() defined but not used
     SUPERGO()
     #undef GO
@@ -427,6 +413,7 @@ static void unwrapGApplicationClass(my_GApplicationClass_t* class)
 // autobridge
 static void bridgeGApplicationClass(my_GApplicationClass_t* class)
 {
+    bridgeGObjectClass(&class->parent_class);
     #define GO(A, W) autobridge_##A##_GApplication (W, class->A)
     SUPERGO()
     #undef GO
@@ -434,6 +421,17 @@ static void bridgeGApplicationClass(my_GApplicationClass_t* class)
 
 #undef SUPERGO
 
+static void unwrapGApplicationInstance(my_GApplication_t* class)
+{
+    unwrapGObjectInstance(&class->parent);
+}
+// autobridge
+static void bridgeGApplicationInstance(my_GApplication_t* class)
+{
+    bridgeGObjectInstance(&class->parent);
+}
+#undef SUPERGO
+
 // ----- GtkApplicationClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkApplication, window_added, void, (void* application, void* window), "pp", application, window);
@@ -469,6 +467,16 @@ static void bridgeGtkApplicationClass(my_GtkApplicationClass_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkApplicationInstance(my_GtkApplication_t* class)
+{
+    unwrapGApplicationInstance(&class->parent);
+}
+
+static void bridgeGtkApplicationInstance(my_GtkApplication_t* class)
+{
+    bridgeGApplicationInstance(&class->parent);
+}
+
 // ----- GtkObjectClass ------
 // wrapper x64 -> natives of callbacks
 WRAPPER(GtkObject, set_arg, void, (void* object, void* arg, uint32_t arg_id), "ppu", object, arg, arg_id);
@@ -482,7 +490,7 @@ WRAPPER(GtkObject, destroy, void, (void* object), "p", object);
 // wrap (so bridge all calls, just in case)
 static void wrapGtkObjectClass(my_GtkObjectClass_t* class)
 {
-    wrapGObjectClass(&class->parent_class);
+    wrapGInitiallyUnownedClass(&class->parent_class);
     #define GO(A, W) class->A = reverse_##A##_GtkObject (W, class->A)
     SUPERGO()
     #undef GO
@@ -490,7 +498,7 @@ static void wrapGtkObjectClass(my_GtkObjectClass_t* class)
 // unwrap (and use callback if not a native call anymore)
 static void unwrapGtkObjectClass(my_GtkObjectClass_t* class)
 {
-    unwrapGObjectClass(&class->parent_class);
+    unwrapGInitiallyUnownedClass(&class->parent_class);
     #define GO(A, W)   class->A = find_##A##_GtkObject (class->A)
     SUPERGO()
     #undef GO
@@ -498,7 +506,7 @@ static void unwrapGtkObjectClass(my_GtkObjectClass_t* class)
 // autobridge
 static void bridgeGtkObjectClass(my_GtkObjectClass_t* class)
 {
-    bridgeGObjectClass(&class->parent_class);
+    bridgeGInitiallyUnownedClass(&class->parent_class);
     #define GO(A, W) autobridge_##A##_GtkObject (W, class->A)
     SUPERGO()
     #undef GO
@@ -506,6 +514,16 @@ static void bridgeGtkObjectClass(my_GtkObjectClass_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkObjectInstance(my_GtkObject_t* class)
+{
+    unwrapGInitiallyUnownedInstance(&class->parent);
+}
+// autobridge
+static void bridgeGtkObjectInstance(my_GtkObject_t* class)
+{
+    bridgeGInitiallyUnownedInstance(&class->parent);
+}
+
 // ----- GtkWidget2Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkWidget2, dispatch_child_properties_changed, void, (void* widget, uint32_t n_pspecs, void* pspecs), "pup", widget, n_pspecs, pspecs);
@@ -670,6 +688,16 @@ static void bridgeGtkWidget2Class(my_GtkWidget2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkWidget2Instance(my_GtkWidget2_t* class)
+{
+    unwrapGtkObjectInstance(&class->private);
+}
+// autobridge
+static void bridgeGtkWidget2Instance(my_GtkWidget2_t* class)
+{
+    bridgeGtkObjectInstance(&class->private);
+}
+
 // ----- GtkWidget3Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkWidget3, dispatch_child_properties_changed, void, (void* widget, uint32_t n_pspecs, void* pspecs), "pup", widget, n_pspecs, pspecs);
@@ -867,6 +895,16 @@ static void bridgeGtkWidget3Class(my_GtkWidget3Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkWidget3Instance(my_GtkWidget3_t* class)
+{
+    unwrapGInitiallyUnownedInstance(&class->parent);
+}
+// autobridge
+static void bridgeGtkWidget3Instance(my_GtkWidget3_t* class)
+{
+    bridgeGInitiallyUnownedInstance(&class->parent);
+}
+
 // ----- GtkContainer2Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkContainer2, add, void, (void* container, void* widget), "pp", container, widget);
@@ -917,6 +955,16 @@ static void bridgeGtkContainer2Class(my_GtkContainer2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkContainer2Instance(my_GtkContainer2_t* class)
+{
+    unwrapGtkWidget2Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkContainer2Instance(my_GtkContainer2_t* class)
+{
+    bridgeGtkWidget2Instance(&class->parent);
+}
+
 // ----- GtkContainer3Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkContainer3, add, void, (void* container, void* widget), "pp", container, widget);
@@ -969,6 +1017,16 @@ static void bridgeGtkContainer3Class(my_GtkContainer3Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkContainer3Instance(my_GtkContainer3_t* class)
+{
+    unwrapGtkWidget3Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkContainer3Instance(my_GtkContainer3_t* class)
+{
+    bridgeGtkWidget3Instance(&class->parent);
+}
+
 // ----- GtkActionClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkAction, activate, void, (void* action), "p", action);
@@ -1012,6 +1070,16 @@ static void bridgeGtkActionClass(my_GtkActionClass_t* class)
 }
 #undef SUPERGO
 
+static void unwrapGtkActionInstance(my_GtkAction_t* class)
+{
+    unwrapGObjectInstance(&class->parent);
+}
+// autobridge
+static void bridgeGtkActionInstance(my_GtkAction_t* class)
+{
+    bridgeGObjectInstance(&class->parent);
+}
+
 // ----- GtkMisc2Class ------
 
 // wrap (so bridge all calls, just in case)
@@ -1030,6 +1098,15 @@ static void bridgeGtkMisc2Class(my_GtkMisc2Class_t* class)
     bridgeGtkWidget2Class(&class->parent_class);
 }
 
+static void unwrapGtkMisc2Instance(my_GtkMisc2_t* class)
+{
+    unwrapGtkWidget2Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkMisc2Instance(my_GtkMisc2_t* class)
+{
+    bridgeGtkWidget2Instance(&class->parent);
+}
 // ----- GtkMisc3Class ------
 // no wrapper x86 -> natives of callbacks
 
@@ -1062,38 +1139,15 @@ static void bridgeGtkMisc3Class(my_GtkMisc3Class_t* class)
 
 #undef SUPERGO
 
-// ----- GtkGtkMenuButtonClass ------
-// wrapper x86 -> natives of callbacks
-WRAPPER(GtkMenuButton, activate, void, (void* self), "p", self);
-
-#define SUPERGO() \
-    GO(activate, vFp);
-
-// wrap (so bridge all calls, just in case)
-static void wrapGtkMenuButtonClass(my_GtkMenuButtonClass_t* class)
+static void unwrapGtkMisc3Instance(my_GtkMisc3_t* class)
 {
-    wrapGtkWidget3Class(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkMenuButton (W, class->A)
-    SUPERGO()
-    #undef GO
-}
-// unwrap (and use callback if not a native call anymore)
-static void unwrapGtkMenuButtonClass(my_GtkMenuButtonClass_t* class)
-{
-    unwrapGtkWidget3Class(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkMenuButton (class->A)
-    SUPERGO()
-    #undef GO
+    unwrapGtkWidget3Instance(&class->parent);
 }
 // autobridge
-static void bridgeGtkMenuButtonClass(my_GtkMenuButtonClass_t* class)
+static void bridgeGtkMisc3Instance(my_GtkMisc3_t* class)
 {
-    bridgeGtkWidget3Class(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkMenuButton (W, class->A)
-    SUPERGO()
-    #undef GO
+    bridgeGtkWidget3Instance(&class->parent);
 }
-#undef SUPERGO
 
 // ----- GtkLabel2Class ------
 // wrapper x86 -> natives of callbacks
@@ -1134,6 +1188,16 @@ static void bridgeGtkLabel2Class(my_GtkLabel2Class_t* class)
 }
 #undef SUPERGO
 
+static void unwrapGtkLabel2Instance(my_GtkLabel2_t* class)
+{
+    unwrapGtkMisc2Instance(&class->misc);
+}
+// autobridge
+static void bridgeGtkLabel2Instance(my_GtkLabel2_t* class)
+{
+    bridgeGtkMisc2Instance(&class->misc);
+}
+
 // ----- GtkLabel3Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkLabel3, move_cursor, void, (void* label, int step, int count, int extend_selection), "piii", label, step, count, extend_selection);
@@ -1174,6 +1238,16 @@ static void bridgeGtkLabel3Class(my_GtkLabel3Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkLabel3Instance(my_GtkLabel3_t* class)
+{
+    unwrapGtkMisc3Instance(&class->misc);
+}
+// autobridge
+static void bridgeGtkLabel3Instance(my_GtkLabel3_t* class)
+{
+    bridgeGtkMisc3Instance(&class->misc);
+}
+
 // ----- GtkTreeView2Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkTreeView2, set_scroll_adjustments, void, (void* tree_view, void* hadjustment, void* vadjustment), "ppp", tree_view, hadjustment, vadjustment);
@@ -1238,6 +1312,16 @@ static void bridgeGtkTreeView2Class(my_GtkTreeView2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkTreeView2Instance(my_GtkTreeView2_t* class)
+{
+    unwrapGtkContainer2Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkTreeView2Instance(my_GtkTreeView2_t* class)
+{
+    bridgeGtkContainer2Instance(&class->parent);
+}
+
 // ----- GtkBin2Class ------
 
 // wrap (so bridge all calls, just in case)
@@ -1256,6 +1340,16 @@ static void bridgeGtkBin2Class(my_GtkBin2Class_t* class)
     bridgeGtkContainer2Class(&class->parent_class);
 }
 
+static void unwrapGtkBin2Instance(my_GtkBin2_t* class)
+{
+    unwrapGtkContainer2Instance(&class->container);
+}
+// autobridge
+static void bridgeGtkBin2Instance(my_GtkBin2_t* class)
+{
+    bridgeGtkContainer2Instance(&class->container);
+}
+
 // ----- GtkBin3Class ------
 static void wrapGtkBin3Class(my_GtkBin3Class_t* class)
 {
@@ -1272,6 +1366,15 @@ static void bridgeGtkBin3Class(my_GtkBin3Class_t* class)
     bridgeGtkContainer3Class(&class->parent_class);
 }
 
+static void unwrapGtkBin3Instance(my_GtkBin3_t* class)
+{
+    unwrapGtkContainer3Instance(&class->container);
+}
+// autobridge
+static void bridgeGtkBin3Instance(my_GtkBin3_t* class)
+{
+    bridgeGtkContainer3Instance(&class->container);
+}
 // ----- GtkWindow2Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkWindow2, set_focus, void, (void* window, void* focus), "pp", window, focus);
@@ -1317,6 +1420,16 @@ static void bridgeGtkWindow2Class(my_GtkWindow2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkWindow2Instance(my_GtkWindow2_t* class)
+{
+    unwrapGtkBin2Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkWindow2Instance(my_GtkWindow2_t* class)
+{
+    bridgeGtkBin2Instance(&class->parent);
+}
+
 // ----- GtkWindow3Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkWindow3, set_focus, void, (void* window, void* focus), "pp", window, focus);
@@ -1360,6 +1473,16 @@ static void bridgeGtkWindow3Class(my_GtkWindow3Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkWindow3Instance(my_GtkWindow3_t* class)
+{
+    unwrapGtkBin3Instance(&class->bin);
+}
+// autobridge
+static void bridgeGtkWindow3Instance(my_GtkWindow3_t* class)
+{
+    bridgeGtkBin3Instance(&class->bin);
+}
+
 // ----- GtkApplicationWindowClass ------
 // wrap (so bridge all calls, just in case)
 static void wrapGtkApplicationWindowClass(my_GtkApplicationWindowClass_t* class)
@@ -1377,6 +1500,15 @@ static void bridgeGtkApplicationWindowClass(my_GtkApplicationWindowClass_t* clas
     bridgeGtkWindow3Class(&class->parent_class);
 }
 
+static void unwrapGtkApplicationWindowInstance(my_GtkApplicationWindow_t* class)
+{
+    unwrapGtkWindow3Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkApplicationWindowInstance(my_GtkApplicationWindow_t* class)
+{
+    bridgeGtkWindow3Instance(&class->parent);
+}
 // ----- GtkListBoxClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkListBoxClass,row_selected, void, (void *box, void *row), "pp", box, row);
@@ -1425,6 +1557,16 @@ static void bridgeGtkListBoxClass(my_GtkListBoxClass_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkListBoxInstance(my_GtkListBox_t* class)
+{
+    unwrapGtkContainer3Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkListBoxInstance(my_GtkListBox_t* class)
+{
+    bridgeGtkContainer3Instance(&class->parent);
+}
+
 // ----- GtkListBoxRowClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkListBoxRowClass, activate, void, (void *row), "p", row);
@@ -1459,6 +1601,16 @@ static void bridgeGtkListBoxRowClass(my_GtkListBoxRowClass_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkListBoxRowInstance(my_GtkListBoxRow_t* class)
+{
+    unwrapGtkBin3Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkListBoxRowInstance(my_GtkListBoxRow_t* class)
+{
+    bridgeGtkBin3Instance(&class->parent);
+}
+
 // ----- GtkTable2Class ------
 // wrap (so bridge all calls, just in case)
 static void wrapGtkTable2Class(my_GtkTable2Class_t* class)
@@ -1476,6 +1628,15 @@ static void bridgeGtkTable2Class(my_GtkTable2Class_t* class)
     bridgeGtkContainer2Class(&class->parent_class);
 }
 
+static void unwrapGtkTable2Instance(my_GtkTable2_t* class)
+{
+    unwrapGtkContainer2Instance(&class->container);
+}
+// autobridge
+static void bridgeGtkTable2Instance(my_GtkTable2_t* class)
+{
+    bridgeGtkContainer2Instance(&class->container);
+}
 // ----- GtkFixed2Class ------
 
 // wrap (so bridge all calls, just in case)
@@ -1494,6 +1655,15 @@ static void bridgeGtkFixed2Class(my_GtkFixed2Class_t* class)
     bridgeGtkContainer2Class(&class->parent_class);
 }
 
+static void unwrapGtkFixed2Instance(my_GtkFixed2_t* class)
+{
+    unwrapGtkContainer2Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkFixed2Instance(my_GtkFixed2_t* class)
+{
+    bridgeGtkContainer2Instance(&class->parent);
+}
 // ----- MetaFrames2Class ------
 
 // wrap (so bridge all calls, just in case)
@@ -1512,6 +1682,15 @@ static void bridgeMetaFrames2Class(my_MetaFrames2Class_t* class)
     bridgeGtkWindow2Class(&class->parent_class);
 }
 
+static void unwrapMetaFrames2Instance(my_MetaFrames2_t* class)
+{
+    unwrapGtkWindow2Instance(&class->parent);
+}
+// autobridge
+static void bridgeMetaFrames2Instance(my_MetaFrames2_t* class)
+{
+    bridgeGtkWindow2Instance(&class->parent);
+}
 // ----- GDBusObjectManagerClientClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GDBusObjectManagerClient,interface_proxy_signal, void, (void* manager, void* object_proxy, void* interface_proxy, void* sender_name, void* signal_name, void* parameters), "pppppp", manager, object_proxy, interface_proxy, sender_name, signal_name, parameters);
@@ -1549,6 +1728,16 @@ static void bridgeGDBusObjectManagerClientClass(my_GDBusObjectManagerClientClass
 
 #undef SUPERGO
 
+static void unwrapGDBusObjectManagerClientInstance(my_GDBusObjectManagerClient_t* class)
+{
+    unwrapGObjectInstance(&class->parent);
+}
+// autobridge
+static void bridgeGDBusObjectManagerClientInstance(my_GDBusObjectManagerClient_t* class)
+{
+    bridgeGObjectInstance(&class->parent);
+}
+
 // ----- GtkButton2Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkButton2, pressed, void,  (void* button), "p", button);
@@ -1594,6 +1783,16 @@ static void bridgeGtkButton2Class(my_GtkButton2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkButton2Instance(my_GtkButton2_t* class)
+{
+    unwrapGtkBin2Instance(&class->bin);
+}
+// autobridge
+static void bridgeGtkButton2Instance(my_GtkButton2_t* class)
+{
+    bridgeGtkBin2Instance(&class->bin);
+}
+
 // ----- GtkButton3Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkButton3, pressed, void,  (void* button), "p", button);
@@ -1639,6 +1838,16 @@ static void bridgeGtkButton3Class(my_GtkButton3Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkButton3Instance(my_GtkButton3_t* class)
+{
+    unwrapGtkBin3Instance(&class->bin);
+}
+// autobridge
+static void bridgeGtkButton3Instance(my_GtkButton3_t* class)
+{
+    bridgeGtkBin3Instance(&class->bin);
+}
+
 // ----- GtkComboBox2Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkComboBox2, changed, void, (void* combo_box), "p", combo_box);
@@ -1676,6 +1885,16 @@ static void bridgeGtkComboBox2Class(my_GtkComboBox2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkComboBox2Instance(my_GtkComboBox2_t* class)
+{
+    unwrapGtkBin2Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkComboBox2Instance(my_GtkComboBox2_t* class)
+{
+    bridgeGtkBin2Instance(&class->parent);
+}
+
 // ----- GtkToggleButton2Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkToggleButton2, toggled, void, (void* toggle_button), "p", toggle_button);
@@ -1711,6 +1930,61 @@ static void bridgeGtkToggleButton2Class(my_GtkToggleButton2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkToggleButton2Instance(my_GtkToggleButton2_t* class)
+{
+    unwrapGtkButton2Instance(&class->button);
+}
+// autobridge
+static void bridgeGtkToggleButton2Instance(my_GtkToggleButton2_t* class)
+{
+    bridgeGtkButton2Instance(&class->button);
+}
+
+// ----- GtkToggleButton3Class ------
+// wrapper x86 -> natives of callbacks
+WRAPPER(GtkToggleButton3, toggled, void, (void* toggle_button), "p", toggle_button);
+
+#define SUPERGO()               \
+    GO(toggled, vFp);           \
+
+
+// wrap (so bridge all calls, just in case)
+static void wrapGtkToggleButton3Class(my_GtkToggleButton3Class_t* class)
+{
+    wrapGtkButton3Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkToggleButton3 (W, class->A)
+    SUPERGO()
+    #undef GO
+}
+// unwrap (and use callback if not a native call anymore)
+static void unwrapGtkToggleButton3Class(my_GtkToggleButton3Class_t* class)
+{
+    unwrapGtkButton3Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkToggleButton3 (class->A)
+    SUPERGO()
+    #undef GO
+}
+// autobridge
+static void bridgeGtkToggleButton3Class(my_GtkToggleButton3Class_t* class)
+{
+    bridgeGtkButton3Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkToggleButton2 (W, class->A)
+    SUPERGO()
+    #undef GO
+}
+
+#undef SUPERGO
+
+static void unwrapGtkToggleButton3Instance(my_GtkToggleButton3_t* class)
+{
+    unwrapGtkButton3Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkToggleButton3Instance(my_GtkToggleButton3_t* class)
+{
+    bridgeGtkButton3Instance(&class->parent);
+}
+
 // ----- GtkCheckButton2Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkCheckButton2, draw_indicator, void, (void* check_button, void* area), "pp", check_button, area);
@@ -1746,6 +2020,100 @@ static void bridgeGtkCheckButton2Class(my_GtkCheckButton2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkCheckButton2Instance(my_GtkCheckButton2_t* class)
+{
+    unwrapGtkToggleButton2Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkCheckButton2Instance(my_GtkCheckButton2_t* class)
+{
+    bridgeGtkToggleButton2Instance(&class->parent);
+}
+
+// ----- GtkCheckButton3Class ------
+// wrapper x86 -> natives of callbacks
+WRAPPER(GtkCheckButton3, draw_indicator, void, (void* check_button, void* area), "pp", check_button, area);
+
+#define SUPERGO()               \
+    GO(draw_indicator, vFpp);   \
+
+
+// wrap (so bridge all calls, just in case)
+static void wrapGtkCheckButton3Class(my_GtkCheckButton3Class_t* class)
+{
+    wrapGtkToggleButton3Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkCheckButton3 (W, class->A)
+    SUPERGO()
+    #undef GO
+}
+// unwrap (and use callback if not a native call anymore)
+static void unwrapGtkCheckButton3Class(my_GtkCheckButton3Class_t* class)
+{
+    unwrapGtkToggleButton3Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkCheckButton3 (class->A)
+    SUPERGO()
+    #undef GO
+}
+// autobridge
+static void bridgeGtkCheckButton3Class(my_GtkCheckButton3Class_t* class)
+{
+    bridgeGtkToggleButton3Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkCheckButton3 (W, class->A)
+    SUPERGO()
+    #undef GO
+}
+
+#undef SUPERGO
+
+static void unwrapGtkCheckButton3Instance(my_GtkCheckButton3_t* class)
+{
+    unwrapGtkToggleButton3Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkCheckButton3Instance(my_GtkCheckButton3_t* class)
+{
+    bridgeGtkToggleButton3Instance(&class->parent);
+}
+// ----- GtkGtkMenuButton3Class ------
+// wrapper x86 -> natives of callbacks
+
+#define SUPERGO() \
+
+// wrap (so bridge all calls, just in case)
+static void wrapGtkMenuButton3Class(my_GtkMenuButton3Class_t* class)
+{
+    wrapGtkToggleButton3Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkMenuButton3 (W, class->A)
+    SUPERGO()
+    #undef GO
+}
+// unwrap (and use callback if not a native call anymore)
+static void unwrapGtkMenuButton3Class(my_GtkMenuButton3Class_t* class)
+{
+    unwrapGtkToggleButton3Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkMenuButton3 (class->A)
+    SUPERGO()
+    #undef GO
+}
+// autobridge
+static void bridgeGtkMenuButton3Class(my_GtkMenuButton3Class_t* class)
+{
+    bridgeGtkToggleButton3Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkMenuButton3 (W, class->A)
+    SUPERGO()
+    #undef GO
+}
+#undef SUPERGO
+
+static void unwrapGtkMenuButton3Instance(my_GtkMenuButton3_t* class)
+{
+    unwrapGtkToggleButton3Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkMenuButton3Instance(my_GtkMenuButton3_t* class)
+{
+    bridgeGtkToggleButton3Instance(&class->parent);
+}
 // ----- GtkEntry2Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkEntry2, populate_popup, void,     (void* entry, void* menu), "pp", entry, menu);
@@ -1800,6 +2168,16 @@ static void bridgeGtkEntry2Class(my_GtkEntry2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkEntry2Instance(my_GtkEntry2_t* class)
+{
+    unwrapGtkWidget2Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkEntry2Instance(my_GtkEntry2_t* class)
+{
+    bridgeGtkWidget2Instance(&class->parent);
+}
+
 // ----- GtkSpinButton2Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkSpinButton2, input, int,  (void* spin_button, void* new_value), "pp", spin_button, new_value);
@@ -1842,6 +2220,16 @@ static void bridgeGtkSpinButton2Class(my_GtkSpinButton2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkSpinButton2Instance(my_GtkSpinButton2_t* class)
+{
+    unwrapGtkEntry2Instance(&class->entry);
+}
+// autobridge
+static void bridgeGtkSpinButton2Instance(my_GtkSpinButton2_t* class)
+{
+    bridgeGtkEntry2Instance(&class->entry);
+}
+
 // ----- GtkProgress2Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkProgress2, paint, void,          (void* progress), "p", progress);
@@ -1856,7 +2244,7 @@ WRAPPER(GtkProgress2, act_mode_enter, void, (void* progress), "p", progress);
 // wrap (so bridge all calls, just in case)
 static void wrapGtkProgress2Class(my_GtkProgress2Class_t* class)
 {
-    wrapGtkWidget2Class(&class->parent_class);
+    wrapGtkWidget2Class(&class->parent);
     #define GO(A, W) class->A = reverse_##A##_GtkProgress2 (W, class->A)
     SUPERGO()
     #undef GO
@@ -1864,7 +2252,7 @@ static void wrapGtkProgress2Class(my_GtkProgress2Class_t* class)
 // unwrap (and use callback if not a native call anymore)
 static void unwrapGtkProgress2Class(my_GtkProgress2Class_t* class)
 {
-    unwrapGtkWidget2Class(&class->parent_class);
+    unwrapGtkWidget2Class(&class->parent);
     #define GO(A, W)   class->A = find_##A##_GtkProgress2 (class->A)
     SUPERGO()
     #undef GO
@@ -1872,7 +2260,7 @@ static void unwrapGtkProgress2Class(my_GtkProgress2Class_t* class)
 // autobridge
 static void bridgeGtkProgress2Class(my_GtkProgress2Class_t* class)
 {
-    bridgeGtkWidget2Class(&class->parent_class);
+    bridgeGtkWidget2Class(&class->parent);
     #define GO(A, W) autobridge_##A##_GtkProgress2 (W, class->A)
     SUPERGO()
     #undef GO
@@ -1880,6 +2268,16 @@ static void bridgeGtkProgress2Class(my_GtkProgress2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkProgress2Instance(my_GtkProgress2_t* class)
+{
+    unwrapGtkWidget2Instance(&class->widget);
+}
+// autobridge
+static void bridgeGtkProgress2Instance(my_GtkProgress2_t* class)
+{
+    bridgeGtkWidget2Instance(&class->widget);
+}
+
 // ----- GtkProgressBar2Class ------
 // no wrapper x86 -> natives of callbacks
 
@@ -1912,6 +2310,16 @@ static void bridgeGtkProgressBar2Class(my_GtkProgressBar2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkProgressBar2Instance(my_GtkProgressBar2_t* class)
+{
+    unwrapGtkProgress2Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkProgressBar2Instance(my_GtkProgressBar2_t* class)
+{
+    bridgeGtkProgress2Instance(&class->parent);
+}
+
 // ----- GtkFrame2Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkFrame2, compute_child_allocation, void, (void* frame, void* allocation), "pp", frame, allocation);
@@ -1946,6 +2354,16 @@ static void bridgeGtkFrame2Class(my_GtkFrame2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkFrame2Instance(my_GtkFrame2_t* class)
+{
+    unwrapGtkBin2Instance(&class->bin);
+}
+// autobridge
+static void bridgeGtkFrame2Instance(my_GtkFrame2_t* class)
+{
+    bridgeGtkBin2Instance(&class->bin);
+}
+
 // ----- GtkMenuShell2Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkMenuShell2,deactivate, void,      (void* menu_shell), "p", menu_shell);
@@ -1996,6 +2414,16 @@ static void bridgeGtkMenuShell2Class(my_GtkMenuShell2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkMenuShell2Instance(my_GtkMenuShell2_t* class)
+{
+    unwrapGtkContainer2Instance(&class->container);
+}
+// autobridge
+static void bridgeGtkMenuShell2Instance(my_GtkMenuShell2_t* class)
+{
+    bridgeGtkContainer2Instance(&class->container);
+}
+
 // ----- GtkMenuBar2Class ------
 // no wrapper x86 -> natives of callbacks
 
@@ -2028,6 +2456,16 @@ static void bridgeGtkMenuBar2Class(my_GtkMenuBar2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkMenuBar2Instance(my_GtkMenuBar2_t* class)
+{
+    unwrapGtkMenuShell2Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkMenuBar2Instance(my_GtkMenuBar2_t* class)
+{
+    bridgeGtkMenuShell2Instance(&class->parent);
+}
+
 // ----- GtkTextView2Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkTextView2, set_scroll_adjustments, void,   (void* text_view, void* hadjustment, void* vadjustment), "ppp", text_view, hadjustment, vadjustment);
@@ -2086,6 +2524,16 @@ static void bridgeGtkTextView2Class(my_GtkTextView2Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkTextView2Instance(my_GtkTextView2_t* class)
+{
+    unwrapGtkContainer2Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkTextView2Instance(my_GtkTextView2_t* class)
+{
+    bridgeGtkContainer2Instance(&class->parent);
+}
+
 // ----- GtkTextView3Class ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkTextView3, populate_popup, void,           (void* text_view, void* menu), "pp", text_view, menu);
@@ -2146,6 +2594,16 @@ static void bridgeGtkTextView3Class(my_GtkTextView3Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkTextView3Instance(my_GtkTextView3_t* class)
+{
+    unwrapGtkContainer3Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkTextView3Instance(my_GtkTextView3_t* class)
+{
+    bridgeGtkContainer3Instance(&class->parent);
+}
+
 // ----- GtkGrid3Class ------
 // no wrapper x86 -> natives of callbacks
 
@@ -2178,6 +2636,16 @@ static void bridgeGtkGrid3Class(my_GtkGrid3Class_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkGrid3Instance(my_GtkGrid3_t* class)
+{
+    unwrapGtkContainer3Instance(&class->parent);
+}
+// autobridge
+static void bridgeGtkGrid3Instance(my_GtkGrid3_t* class)
+{
+    bridgeGtkContainer3Instance(&class->parent);
+}
+
 // ----- GtkEventControllerClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkEventController, set_widget, void, (void* controller, void* widget), "pp", controller, widget);
@@ -2222,6 +2690,16 @@ static void bridgeGtkEventControllerClass(my_GtkEventControllerClass_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkEventControllerInstance(my_GtkEventController_t* class)
+{
+    unwrapGObjectInstance(&class->parent);
+}
+// autobridge
+static void bridgeGtkEventControllerInstance(my_GtkEventController_t* class)
+{
+    bridgeGObjectInstance(&class->parent);
+}
+
 // ----- GtkGestureClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkGesture, check, void, (void* gesture), "p", gesture);
@@ -2266,6 +2744,16 @@ static void bridgeGtkGestureClass(my_GtkGestureClass_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkGestureInstance(my_GtkGesture_t* class)
+{
+    unwrapGtkEventControllerInstance(&class->parent);
+}
+// autobridge
+static void bridgeGtkGestureInstance(my_GtkGesture_t* class)
+{
+    bridgeGtkEventControllerInstance(&class->parent);
+}
+
 // ----- GtkGestureSingleClass ------
 // wrap (so bridge all calls, just in case)
 static void wrapGtkGestureSingleClass(my_GtkGestureSingleClass_t* class)
@@ -2283,6 +2771,15 @@ static void bridgeGtkGestureSingleClass(my_GtkGestureSingleClass_t* class)
     bridgeGtkGestureClass(&class->parent_class);
 }
 
+static void unwrapGtkGestureSingleInstance(my_GtkGestureSingle_t* class)
+{
+    unwrapGtkGestureInstance(&class->parent);
+}
+// autobridge
+static void bridgeGtkGestureSingleInstance(my_GtkGestureSingle_t* class)
+{
+    bridgeGtkGestureInstance(&class->parent);
+}
 // ----- GtkGestureClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GtkGestureLongPress, pressed, void, (void *gesture, double x, double y), "pdd", gesture, x, y);
@@ -2319,6 +2816,16 @@ static void bridgeGtkGestureLongPressClass(my_GtkGestureLongPressClass_t* class)
 
 #undef SUPERGO
 
+static void unwrapGtkGestureLongPressInstance(my_GtkGestureLongPress_t* class)
+{
+    unwrapGtkGestureSingleInstance(&class->parent);
+}
+// autobridge
+static void bridgeGtkGestureLongPressInstance(my_GtkGestureLongPress_t* class)
+{
+    bridgeGtkGestureSingleInstance(&class->parent);
+}
+
 // ----- AtkObjectClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(AtkObject, get_name, void*, (void* accessible), "p", accessible);
@@ -2403,6 +2910,16 @@ static void bridgeAtkObjectClass(my_AtkObjectClass_t* class)
 
 #undef SUPERGO
 
+static void unwrapAtkObjectInstance(my_AtkObject_t* class)
+{
+    unwrapGObjectInstance(&class->parent);
+}
+// autobridge
+static void bridgeAtkObjectInstance(my_AtkObject_t* class)
+{
+    bridgeGObjectInstance(&class->parent);
+}
+
 // ----- AtkUtilClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(AtkUtil,add_global_event_listener, uint32_t,(void* listener, void* event_type), "pp", AddCheckBridge(my_bridge, iFpupp, listener, 0, NULL), event_type);
@@ -2449,6 +2966,16 @@ static void bridgeAtkUtilClass(my_AtkUtilClass_t* class)
 
 #undef SUPERGO
 
+static void unwrapAtkUtilInstance(my_AtkUtil_t* class)
+{
+    unwrapGObjectInstance(&class->parent);
+}
+// autobridge
+static void bridgeAtkUtilInstance(my_AtkUtil_t* class)
+{
+    bridgeGObjectInstance(&class->parent);
+}
+
 // ----- GstObjectClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstObject, deep_notify, void, (void* object, void* origin, void* pspec), "ppp", object, origin, pspec);
@@ -2483,6 +3010,16 @@ static void bridgeGstObjectClass(my_GstObjectClass_t* class)
 
 #undef SUPERGO
 
+static void unwrapGstObjectInstance(my_GstObject_t* class)
+{
+    unwrapGInitiallyUnownedInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstObjectInstance(my_GstObject_t* class)
+{
+    bridgeGInitiallyUnownedInstance(&class->parent);
+}
+
 // ----- GstAllocatorClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstAllocator, alloc, void*, (void *allocator, size_t size, void *params), "pLp", allocator, size, params);
@@ -2519,6 +3056,40 @@ static void bridgeGstAllocatorClass(my_GstAllocatorClass_t* class)
 
 #undef SUPERGO
 
+WRAPPER(GstAllocatorInstance, mem_map, void*,       (void* mem, size_t maxsize, int flags), "pLi", mem, maxsize, flags);
+WRAPPER(GstAllocatorInstance, mem_unmap, void ,     (void* mem), "p", mem);
+WRAPPER(GstAllocatorInstance, mem_copy, void*,      (void* mem, ssize_t offset, ssize_t size), "pll", mem, offset, size);
+WRAPPER(GstAllocatorInstance, mem_share, void*,     (void* mem, ssize_t offset, ssize_t size), "pll", mem, offset, size);
+WRAPPER(GstAllocatorInstance, mem_is_span, int  ,   (void* mem1, void* mem2, void* offset), "ppp", mem1, mem2, offset);
+WRAPPER(GstAllocatorInstance, mem_map_full, void*,  (void* mem, void* info, size_t maxsize), "ppL", mem, info, maxsize);
+WRAPPER(GstAllocatorInstance, mem_unmap_full, void ,(void* mem, void* info), "pp", mem, info);    
+
+#define SUPERGO()               \
+    GO(mem_map, pFpLi);         \
+    GO(mem_unmap, vFp);         \
+    GO(mem_copy, pFpll);        \
+    GO(mem_share, pFpll);       \
+    GO(mem_is_span, iFppp);     \
+    GO(mem_map_full, pFppL);    \
+    GO(mem_unmap_full, vFpp);   \
+
+static void unwrapGstAllocatorInstance(my_GstAllocator_t* class)
+{
+    unwrapGstObjectInstance(&class->parent);
+    #define GO(A, W)   class->A = find_##A##_GstAllocatorInstance (class->A)
+    SUPERGO()
+    #undef GO
+}
+// autobridge
+static void bridgeGstAllocatorInstance(my_GstAllocator_t* class)
+{
+    bridgeGstObjectInstance(&class->parent);
+    #define GO(A, W) autobridge_##A##_GstAllocatorInstance (W, class->A)
+    SUPERGO()
+    #undef GO
+}
+#undef SUPERGO
+
 // ----- GstTaskPoolClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstTaskPool, prepare, void,  (void* pool, void* error), "pp", pool, error);
@@ -2561,6 +3132,16 @@ static void bridgeGstTaskPoolClass(my_GstTaskPoolClass_t* class)
 
 #undef SUPERGO
 
+static void unwrapGstTaskPoolInstance(my_GstTaskPool_t* class)
+{
+    unwrapGstObjectInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstTaskPoolInstance(my_GstTaskPool_t* class)
+{
+    bridgeGstObjectInstance(&class->parent);
+}
+
 // ----- GstElementClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstElement,pad_added, void, (void* element, void* pad), "pp", element, pad);
@@ -2625,6 +3206,17 @@ static void bridgeGstElementClass(my_GstElementClass_t* class)
 
 #undef SUPERGO
 
+static void unwrapGstElementInstance(my_GstElement_t* class)
+{
+    unwrapGstObjectInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstElementInstance(my_GstElement_t* class)
+{
+    bridgeGstObjectInstance(&class->parent);
+}
+#undef SUPERGO
+
 // ----- GstBinClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstBin,element_added, void, (void* bin, void* child), "pp", bin, child);
@@ -2673,6 +3265,16 @@ static void bridgeGstBinClass(my_GstBinClass_t* class)
 
 #undef SUPERGO
 
+static void unwrapGstBinInstance(my_GstBin_t* class)
+{
+    unwrapGstElementInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstBinInstance(my_GstBin_t* class)
+{
+    bridgeGstElementInstance(&class->parent);
+}
+
 // ----- GstBaseTransformClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstBaseTransform, transform_caps, void*, (void* trans, int direction, void* caps, void* filter), "pipp", trans, direction, caps, filter);
@@ -2748,6 +3350,16 @@ static void bridgeGstBaseTransformClass(my_GstBaseTransformClass_t* class)
 }
 
 #undef SUPERGO
+
+static void unwrapGstBaseTransformInstance(my_GstBaseTransform_t* class)
+{
+    unwrapGstElementInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstBaseTransformInstance(my_GstBaseTransform_t* class)
+{
+    bridgeGstElementInstance(&class->parent);
+}
 // ----- GstVideoDecoderClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstVideoDecoder, open, int, (void* decoder), "p", decoder);
@@ -2821,6 +3433,16 @@ static void bridgeGstVideoDecoderClass(my_GstVideoDecoderClass_t* class)
 }
 
 #undef SUPERGO
+
+static void unwrapGstVideoDecoderInstance(my_GstVideoDecoder_t* class)
+{
+    unwrapGstElementInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstVideoDecoderInstance(my_GstVideoDecoder_t* class)
+{
+    bridgeGstElementInstance(&class->parent);
+}
 // ----- GstVideoEncoderClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstVideoEncoder, open, int, (void* encoder), "p", encoder);
@@ -2890,6 +3512,16 @@ static void bridgeGstVideoEncoderClass(my_GstVideoEncoderClass_t* class)
 }
 
 #undef SUPERGO
+
+static void unwrapGstVideoEncoderInstance(my_GstVideoEncoder_t* class)
+{
+    unwrapGstElementInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstVideoEncoderInstance(my_GstVideoEncoder_t* class)
+{
+    bridgeGstElementInstance(&class->parent);
+}
 // ----- GstBaseSinkClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstBaseSink, get_caps, void*, (void* sink, void* filter), "pp", sink, filter);
@@ -2956,6 +3588,16 @@ static void bridgeGstBaseSinkClass(my_GstBaseSinkClass_t* class)
     #undef GO
 }
 #undef SUPERGO
+
+static void unwrapGstBaseSinkInstance(my_GstBaseSink_t* class)
+{
+    unwrapGstElementInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstBaseSinkInstance(my_GstBaseSink_t* class)
+{
+    bridgeGstElementInstance(&class->parent);
+}
 // ----- GstVideoSinkClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstVideoSink, show_frame, int, (void* video_sink, void* buf), "pp", video_sink, buf);
@@ -2990,6 +3632,16 @@ static void bridgeGstVideoSinkClass(my_GstVideoSinkClass_t* class)
     #undef GO
 }
 #undef SUPERGO
+
+static void unwrapGstVideoSinkInstance(my_GstVideoSink_t* class)
+{
+    unwrapGstBaseSinkInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstVideoSinkInstance(my_GstVideoSink_t* class)
+{
+    bridgeGstBaseSinkInstance(&class->parent);
+}
 // ----- GstGLBaseFilterClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstGLBaseFilter, gl_start, int, (void* filter), "p", filter);
@@ -3026,6 +3678,16 @@ static void bridgeGstGLBaseFilterClass(my_GstGLBaseFilterClass_t* class)
     #undef GO
 }
 #undef SUPERGO
+
+static void unwrapGstGLBaseFilterInstance(my_GstGLBaseFilter_t* class)
+{
+    unwrapGstBaseTransformInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstGLBaseFilterInstance(my_GstGLBaseFilter_t* class)
+{
+    bridgeGstBaseTransformInstance(&class->parent);
+}
 // ----- GstGLFilterClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstGLFilter, set_caps, int, (void* filter, void* incaps, void* outcaps), "ppp", filter, incaps, outcaps);
@@ -3066,6 +3728,16 @@ static void bridgeGstGLFilterClass(my_GstGLFilterClass_t* class)
     #undef GO
 }
 #undef SUPERGO
+
+static void unwrapGstGLFilterInstance(my_GstGLFilter_t* class)
+{
+    unwrapGstGLBaseFilterInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstGLFilterInstance(my_GstGLFilter_t* class)
+{
+    bridgeGstGLBaseFilterInstance(&class->parent);
+}
 // ----- GstAggregatorClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstAggregator, flush, int, (void* self), "p", self);
@@ -3142,6 +3814,16 @@ static void bridgeGstAggregatorClass(my_GstAggregatorClass_t* class)
     #undef GO
 }
 #undef SUPERGO
+
+static void unwrapGstAggregatorInstance(my_GstAggregator_t* class)
+{
+    unwrapGstElementInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstAggregatorInstance(my_GstAggregator_t* class)
+{
+    bridgeGstElementInstance(&class->parent);
+}
 // ----- GstVideoAggregatorClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstVideoAggregator, update_caps, void*, (void* vagg, void* caps), "pp", vagg, caps);
@@ -3180,6 +3862,16 @@ static void bridgeGstVideoAggregatorClass(my_GstVideoAggregatorClass_t* class)
     #undef GO
 }
 #undef SUPERGO
+
+static void unwrapGstVideoAggregatorInstance(my_GstVideoAggregator_t* class)
+{
+    unwrapGstAggregatorInstance(&class->aggregator);
+}
+// autobridge
+static void bridgeGstVideoAggregatorInstance(my_GstVideoAggregator_t* class)
+{
+    bridgeGstAggregatorInstance(&class->aggregator);
+}
 // ----- GstPadClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstPad, linked, void, (void* pad, void* peer), "pp", pad, peer);
@@ -3214,6 +3906,73 @@ static void bridgeGstPadClass(my_GstPadClass_t* class)
     #undef GO
 }
 #undef SUPERGO
+WRAPPER(GstPadInstance, activatefunc, int    , (void* pad, void* parent), "pp", pad, parent);
+WRAPPER(GstPadInstance, activatenotify, void   , (void* a), "p", a);
+WRAPPER(GstPadInstance, activatemodefunc, int    , (void* pad, void* parent, int mode, int active), "ppii", pad, parent, mode, active);
+WRAPPER(GstPadInstance, activatemodenotify, void   , (void* a), "p", a);
+WRAPPER(GstPadInstance, linkfunc, int    , (void* pad, void* parent, void* peer), "ppp", pad, parent, peer);
+WRAPPER(GstPadInstance, linknotify, void   , (void* a), "p", a);
+WRAPPER(GstPadInstance, unlinkfunc, void   , (void* pad, void* parent), "pp", pad, parent);
+WRAPPER(GstPadInstance, unlinknotify, void   , (void* a), "p", a);
+WRAPPER(GstPadInstance, chainfunc, int    , (void* pad, void* parent, void* buffer), "ppp", pad, parent, buffer);
+WRAPPER(GstPadInstance, chainnotify, void   , (void* a), "p", a);
+WRAPPER(GstPadInstance, chainlistfunc, int    , (void* pad, void* parent, void* list), "ppp", pad, parent, list);
+WRAPPER(GstPadInstance, chainlistnotify, void   , (void* a), "p", a);
+WRAPPER(GstPadInstance, getrangefunc, int    , (void* pad, void* parent, uint64_t offset, uint32_t length, void* buffer), "ppUup", pad, parent, offset, length, buffer);
+WRAPPER(GstPadInstance, getrangenotify, void   , (void* a), "p", a);
+WRAPPER(GstPadInstance, eventfunc, int    , (void* pad, void* parent, void* event), "ppp", pad, parent, event);
+WRAPPER(GstPadInstance, eventnotify, void   , (void* a), "p", a);
+WRAPPER(GstPadInstance, queryfunc, int    , (void* pad, void* parent, void* query), "ppp", pad, parent, query);
+WRAPPER(GstPadInstance, querynotify, void   , (void* a), "p", a);
+WRAPPER(GstPadInstance, iterintlinkfunc, void*  , (void* pad, void* parent), "pp", pad, parent);
+WRAPPER(GstPadInstance, iterintlinknotify, void   , (void* a), "p", a);
+WRAPPER(GstPadInstance, finalize_hook, void   , (void* hook_list, void* hook), "pp", hook_list, hook);
+WRAPPER(GstPadInstance, eventfullfunc, int    , (void* pad, void* parent, void* event), "ppp", pad, parent, event);
+
+#define SUPERGO()                       \
+    GO(activatefunc, iFpp);             \
+    GO(activatenotify, vFp);            \
+    GO(activatemodefunc, iFppii);       \
+    GO(activatemodenotify, vFp);        \
+    GO(linkfunc, iFppp);                \
+    GO(linknotify, vFp);                \
+    GO(unlinkfunc, vFpp);               \
+    GO(unlinknotify, vFp);              \
+    GO(chainfunc, iFppp);               \
+    GO(chainnotify, vFp);               \
+    GO(chainlistfunc, iFppp);           \
+    GO(chainlistnotify, vFp);           \
+    GO(getrangefunc, iFppUup);          \
+    GO(getrangenotify, vFp);            \
+    GO(eventfunc, iFppp);               \
+    GO(eventnotify, vFp);               \
+    GO(queryfunc, iFppp);               \
+    GO(querynotify, vFp);               \
+    GO(iterintlinkfunc, pFpp);          \
+    GO(iterintlinknotify, vFp);         \
+    GO2(probes, finalize_hook, vFpp);   \
+    GO2(ABI.abi, eventfullfunc, vFppp); \
+
+static void unwrapGstPadInstance(my_GstPad_t* class)
+{
+    unwrapGstObjectInstance(&class->parent);
+    #define GO(A, W)   class->A = find_##A##_GstPadInstance (class->A)
+    #define GO2(B, A, W)   class->B.A = find_##A##_GstPadInstance (class->B.A)
+    SUPERGO()
+    #undef GO2
+    #undef GO
+}
+// autobridge
+static void bridgeGstPadInstance(my_GstPad_t* class)
+{
+    bridgeGstObjectInstance(&class->parent);
+    #define GO(A, W) autobridge_##A##_GstPadInstance (W, class->A)
+    #define GO2(B, A, W) autobridge_##A##_GstPadInstance (W, class->B.A)
+    SUPERGO()
+    #undef GO2
+    #undef GO
+}
+#undef SUPERGO
 // ----- GstAggregatorPadClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstAggregatorPad, flush, int, (void* aggpad, void* aggregator), "pp", aggpad, aggregator);
@@ -3248,6 +4007,16 @@ static void bridgeGstAggregatorPadClass(my_GstAggregatorPadClass_t* class)
     #undef GO
 }
 #undef SUPERGO
+
+static void unwrapGstAggregatorPadInstance(my_GstAggregatorPad_t* class)
+{
+    unwrapGstPadInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstAggregatorPadInstance(my_GstAggregatorPad_t* class)
+{
+    bridgeGstPadInstance(&class->parent);
+}
 // ----- GstVideoAggregatorPadClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstVideoAggregatorPad, update_conversion_info, void, (void* pad), "p", pad);
@@ -3288,6 +4057,17 @@ static void bridgeGstVideoAggregatorPadClass(my_GstVideoAggregatorPadClass_t* cl
     #undef GO
 }
 #undef SUPERGO
+
+static void unwrapGstVideoAggregatorPadInstance(my_GstVideoAggregatorPad_t* class)
+{
+    unwrapGstAggregatorPadInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstVideoAggregatorPadInstance(my_GstVideoAggregatorPad_t* class)
+{
+    bridgeGstAggregatorPadInstance(&class->parent);
+}
+#undef SUPERGO
 // ----- GstBaseSrcClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstBaseSrc, get_caps, void*, (void* src, void* filter), "pp", src, filter);
@@ -3356,6 +4136,16 @@ static void bridgeGstBaseSrcClass(my_GstBaseSrcClass_t* class)
     #undef GO
 }
 #undef SUPERGO
+
+static void unwrapGstBaseSrcInstance(my_GstBaseSrc_t* class)
+{
+    unwrapGstElementInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstBaseSrcInstance(my_GstBaseSrc_t* class)
+{
+    bridgeGstElementInstance(&class->parent);
+}
 // ----- GstPushSrcClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstPushSrc, create, int, (void* src, void* buf), "pp", src, buf);
@@ -3392,6 +4182,16 @@ static void bridgeGstPushSrcClass(my_GstPushSrcClass_t* class)
     #undef GO
 }
 #undef SUPERGO
+
+static void unwrapGstPushSrcInstance(my_GstPushSrc_t* class)
+{
+    unwrapGstBaseSrcInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstPushSrcInstance(my_GstPushSrc_t* class)
+{
+    bridgeGstBaseSrcInstance(&class->parent);
+}
 // ----- GstGLBaseSrcClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstGLBaseSrc, gl_start, int, (void* src), "p", src);
@@ -3428,6 +4228,16 @@ static void bridgeGstGLBaseSrcClass(my_GstGLBaseSrcClass_t* class)
     #undef GO
 }
 #undef SUPERGO
+
+static void unwrapGstGLBaseSrcInstance(my_GstGLBaseSrc_t* class)
+{
+    unwrapGstPushSrcInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstGLBaseSrcInstance(my_GstGLBaseSrc_t* class)
+{
+    bridgeGstPushSrcInstance(&class->parent);
+}
 // ----- GstAudioDecoderClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstAudioDecoder, start, int,(void* dec), "p", dec);
@@ -3494,6 +4304,16 @@ static void bridgeGstAudioDecoderClass(my_GstAudioDecoderClass_t* class)
     #undef GO
 }
 #undef SUPERGO
+
+static void unwrapGstAudioDecoderInstance(my_GstAudioDecoder_t* class)
+{
+    unwrapGstElementInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstAudioDecoderInstance(my_GstAudioDecoder_t* class)
+{
+    bridgeGstElementInstance(&class->parent);
+}
 // ----- GstVideoFilterClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstVideoFilter, set_info, int, (void* filter, void* incaps, void* in_info, void* outcaps, void* out_info), "ppppp", filter, incaps, in_info, outcaps, out_info);
@@ -3530,6 +4350,16 @@ static void bridgeGstVideoFilterClass(my_GstVideoFilterClass_t* class)
     #undef GO
 }
 #undef SUPERGO
+
+static void unwrapGstVideoFilterInstance(my_GstVideoFilter_t* class)
+{
+    unwrapGstBaseTransformInstance(&class->parent);
+}
+// autobridge
+static void bridgeGstVideoFilterInstance(my_GstVideoFilter_t* class)
+{
+    bridgeGstBaseTransformInstance(&class->parent);
+}
 // ----- GDBusProxyClass ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GDBusProxy, g_properties_changed, void, (void* proxy, void* changed_properties, const char* const* invalidated_properties), "ppp", proxy, changed_properties, invalidated_properties);
@@ -3565,6 +4395,16 @@ static void bridgeGDBusProxyClass(my_GDBusProxyClass_t* class)
 }
 
 #undef SUPERGO
+
+static void unwrapGDBusProxyInstance(my_GDBusProxy_t* class)
+{
+    unwrapGObjectInstance(&class->parent);
+}
+// autobridge
+static void bridgeGDBusProxyInstance(my_GDBusProxy_t* class)
+{
+    bridgeGObjectInstance(&class->parent);
+}
 // ----- GstURIHandlerInterface ------
 // wrapper x86 -> natives of callbacks
 WRAPPER(GstURIHandler,get_type, int, (size_t type), "L", type);
@@ -3743,6 +4583,41 @@ static void bridgeGTKInterface(void* cl, size_t type)
     #undef GTKIFACE
 }
 
+void unwrapGTKInstance(void* cl, size_t type)
+{
+    #define GTKIFACE(A)
+    #define GTKCLASS(A)                             \
+    if(type==my_##A)                                \
+        unwrap##A##Instance((my_##A##_t*)cl);     \
+    else
+
+    printf_log(LOG_DEBUG, "unwrapGTKInstance(%p, %zd (%s))\n", cl, type, g_type_name(type));
+    GTKCLASSES()
+    if(type==8) {}  // GInterface have no structure
+    else
+    {}  // else no warning, one is enough...
+    #undef GTKCLASS
+    #undef GTKIFACE
+}
+
+void bridgeGTKInstance(void* cl, size_t type)
+{
+    #define GTKIFACE(A)
+    #define GTKCLASS(A)                             \
+    if(type==my_##A)                                \
+        bridge##A##Instance((my_##A##_t*)cl);     \
+    else
+
+    printf_log(LOG_DEBUG, "bridgeGTKInstance(%p, %zd (%s))\n", cl, type, g_type_name(type));
+    GTKCLASSES()
+    if(type==8) {}  // GInterface have no structure
+    else {
+        printf_log(LOG_NONE, "Warning, AutoBridge GTK Class with unknown class type 0w%zx (%s)\n", type, g_type_name(type));
+    }
+    #undef GTKCLASS
+    #undef GTKIFACE
+}
+
 typedef union my_GClassAll_s {
     #define GTKCLASS(A) my_##A##Class_t A;
     #define GTKIFACE(A) my_##A##Interface_t A;
@@ -4361,20 +5236,28 @@ static void* find_class_finalize_Fct(void* fct)
 // instance_init ...
 #define GO(A)   \
 static uintptr_t my_instance_init_fct_##A = 0;                              \
+static size_t parent_instance_init_##A = 0;                                 \
 static int my_instance_init_##A(void* a, void* b)                           \
 {                                                                           \
-    return RunFunctionFmt(my_instance_init_fct_##A, "pp", a, b);\
+    printf_log(LOG_DEBUG, "Custom Instance init %d for class %p (parent=%p:%s)\n", A, a, (void*)parent_instance_init_##A, g_type_name(parent_instance_init_##A));\
+    int ret = RunFunctionFmt(my_instance_init_fct_##A, "pp", a, b);         \
+    size_t type = parent_instance_init_##A;                                 \
+    while(checkRegisteredClass(type))                                       \
+        type = g_type_parent(type);                                         \
+    unwrapGTKInstance(a, type);                                             \
+    bridgeGTKInstance(a, type);                                             \
+    return ret;                                                             \
 }
 SUPER()
 #undef GO
-static void* find_instance_init_Fct(void* fct)
+static void* find_instance_init_Fct(void* fct, size_t parent)
 {
     if(!fct) return fct;
     if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
-    #define GO(A) if(my_instance_init_fct_##A == (uintptr_t)fct) return my_instance_init_##A;
+    #define GO(A) if(my_instance_init_fct_##A == (uintptr_t)fct && parent_instance_init_##A==parent) return my_instance_init_##A;
     SUPER()
     #undef GO
-    #define GO(A) if(my_instance_init_fct_##A == 0) {my_instance_init_fct_##A = (uintptr_t)fct; return my_instance_init_##A; }
+    #define GO(A) if(my_instance_init_fct_##A == 0) {my_instance_init_fct_##A = (uintptr_t)fct; parent_instance_init_##A=parent; return my_instance_init_##A; }
     SUPER()
     #undef GO
     printf_log(LOG_NONE, "Warning, no more slot for GTypeInfo instance_init callback\n");
@@ -4387,20 +5270,20 @@ my_GTypeInfo_t* findFreeGTypeInfo(my_GTypeInfo_t* fcts, size_t parent)
     #define GO(A) if(used_gtypeinfo_##A && memcmp(&ref_gtypeinfo_##A, fcts, sizeof(my_GTypeInfo_t))==0) return &my_gtypeinfo_##A;
     SUPER()
     #undef GO
-    #define GO(A) if(used_gtypeinfo_##A == 0) {                                         \
-        used_gtypeinfo_##A = 1;                                                         \
-        memcpy(&ref_gtypeinfo_##A, fcts, sizeof(my_GTypeInfo_t));                       \
-        my_gtypeinfo_##A.class_size = fcts->class_size;                                 \
-        my_gtypeinfo_##A.base_init = find_base_init_Fct(fcts->base_init);               \
-        my_gtypeinfo_##A.base_finalize = find_base_finalize_Fct(fcts->base_finalize);   \
-        my_gtypeinfo_##A.class_init = find_class_init_Fct(fcts->class_init, parent);    \
-        my_gtypeinfo_##A.class_finalize = find_class_finalize_Fct(fcts->class_finalize);\
-        my_gtypeinfo_##A.class_data = fcts->class_data;                                 \
-        my_gtypeinfo_##A.instance_size = fcts->instance_size;                           \
-        my_gtypeinfo_##A.n_preallocs = fcts->n_preallocs;                               \
-        my_gtypeinfo_##A.instance_init = find_instance_init_Fct(fcts->instance_init);   \
-        my_gtypeinfo_##A.value_table = findFreeGTypeValueTable(fcts->value_table);      \
-        return &my_gtypeinfo_##A;                                                       \
+    #define GO(A) if(used_gtypeinfo_##A == 0) {                                                 \
+        used_gtypeinfo_##A = 1;                                                                 \
+        memcpy(&ref_gtypeinfo_##A, fcts, sizeof(my_GTypeInfo_t));                               \
+        my_gtypeinfo_##A.class_size = fcts->class_size;                                         \
+        my_gtypeinfo_##A.base_init = find_base_init_Fct(fcts->base_init);                       \
+        my_gtypeinfo_##A.base_finalize = find_base_finalize_Fct(fcts->base_finalize);           \
+        my_gtypeinfo_##A.class_init = find_class_init_Fct(fcts->class_init, parent);            \
+        my_gtypeinfo_##A.class_finalize = find_class_finalize_Fct(fcts->class_finalize);        \
+        my_gtypeinfo_##A.class_data = fcts->class_data;                                         \
+        my_gtypeinfo_##A.instance_size = fcts->instance_size;                                   \
+        my_gtypeinfo_##A.n_preallocs = fcts->n_preallocs;                                       \
+        my_gtypeinfo_##A.instance_init = find_instance_init_Fct(fcts->instance_init, parent);   \
+        my_gtypeinfo_##A.value_table = findFreeGTypeValueTable(fcts->value_table);              \
+        return &my_gtypeinfo_##A;                                                               \
     }
     SUPER()
     #undef GO
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 03ae7f8b..01b2f668 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -689,6 +689,7 @@
 #() pFplu
 #() pFpll
 #() pFplp
+#() pFpLi
 #() pFpLu
 #() pFpLL
 #() pFpLp
@@ -1544,6 +1545,7 @@
 #() iFppuup
 #() iFppupi
 #() iFppupp
+#() iFppUup
 #() iFpplii
 #() iFppllp
 #() iFpplpp
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 5292f4e7..a577eaba 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -725,6 +725,7 @@ typedef void* (*pFplC_t)(void*, intptr_t, uint8_t);
 typedef void* (*pFplu_t)(void*, intptr_t, uint32_t);
 typedef void* (*pFpll_t)(void*, intptr_t, intptr_t);
 typedef void* (*pFplp_t)(void*, intptr_t, void*);
+typedef void* (*pFpLi_t)(void*, uintptr_t, int32_t);
 typedef void* (*pFpLu_t)(void*, uintptr_t, uint32_t);
 typedef void* (*pFpLL_t)(void*, uintptr_t, uintptr_t);
 typedef void* (*pFpLp_t)(void*, uintptr_t, void*);
@@ -1580,6 +1581,7 @@ typedef int32_t (*iFppuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFppuup_t)(void*, void*, uint32_t, uint32_t, void*);
 typedef int32_t (*iFppupi_t)(void*, void*, uint32_t, void*, int32_t);
 typedef int32_t (*iFppupp_t)(void*, void*, uint32_t, void*, void*);
+typedef int32_t (*iFppUup_t)(void*, void*, uint64_t, uint32_t, void*);
 typedef int32_t (*iFpplii_t)(void*, void*, intptr_t, int32_t, int32_t);
 typedef int32_t (*iFppllp_t)(void*, void*, intptr_t, intptr_t, void*);
 typedef int32_t (*iFpplpp_t)(void*, void*, intptr_t, void*, void*);
@@ -3670,6 +3672,7 @@ void pFplC(x64emu_t *emu, uintptr_t fcn) { pFplC_t fn = (pFplC_t)fcn; R_RAX=(uin
 void pFplu(x64emu_t *emu, uintptr_t fcn) { pFplu_t fn = (pFplu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (uint32_t)R_RDX); }
 void pFpll(x64emu_t *emu, uintptr_t fcn) { pFpll_t fn = (pFpll_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
 void pFplp(x64emu_t *emu, uintptr_t fcn) { pFplp_t fn = (pFplp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX); }
+void pFpLi(x64emu_t *emu, uintptr_t fcn) { pFpLi_t fn = (pFpLi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX); }
 void pFpLu(x64emu_t *emu, uintptr_t fcn) { pFpLu_t fn = (pFpLu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX); }
 void pFpLL(x64emu_t *emu, uintptr_t fcn) { pFpLL_t fn = (pFpLL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX); }
 void pFpLp(x64emu_t *emu, uintptr_t fcn) { pFpLp_t fn = (pFpLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
@@ -4525,6 +4528,7 @@ void iFppuuu(x64emu_t *emu, uintptr_t fcn) { iFppuuu_t fn = (iFppuuu_t)fcn; R_RA
 void iFppuup(x64emu_t *emu, uintptr_t fcn) { iFppuup_t fn = (iFppuup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void iFppupi(x64emu_t *emu, uintptr_t fcn) { iFppupi_t fn = (iFppupi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void iFppupp(x64emu_t *emu, uintptr_t fcn) { iFppupp_t fn = (iFppupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void iFppUup(x64emu_t *emu, uintptr_t fcn) { iFppUup_t fn = (iFppUup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void iFpplii(x64emu_t *emu, uintptr_t fcn) { iFpplii_t fn = (iFpplii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void iFppllp(x64emu_t *emu, uintptr_t fcn) { iFppllp_t fn = (iFppllp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX, (void*)R_R8); }
 void iFpplpp(x64emu_t *emu, uintptr_t fcn) { iFpplpp_t fn = (iFpplpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -6525,6 +6529,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFplu) return 1;
 	if (fun == &pFpll) return 1;
 	if (fun == &pFplp) return 1;
+	if (fun == &pFpLi) return 1;
 	if (fun == &pFpLu) return 1;
 	if (fun == &pFpLL) return 1;
 	if (fun == &pFpLp) return 1;
@@ -7241,6 +7246,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFppuup) return 1;
 	if (fun == &iFppupi) return 1;
 	if (fun == &iFppupp) return 1;
+	if (fun == &iFppUup) return 1;
 	if (fun == &iFpplii) return 1;
 	if (fun == &iFppllp) return 1;
 	if (fun == &iFpplpp) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 6d3757bf..e3aa6a81 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -726,6 +726,7 @@ void pFplC(x64emu_t *emu, uintptr_t fnc);
 void pFplu(x64emu_t *emu, uintptr_t fnc);
 void pFpll(x64emu_t *emu, uintptr_t fnc);
 void pFplp(x64emu_t *emu, uintptr_t fnc);
+void pFpLi(x64emu_t *emu, uintptr_t fnc);
 void pFpLu(x64emu_t *emu, uintptr_t fnc);
 void pFpLL(x64emu_t *emu, uintptr_t fnc);
 void pFpLp(x64emu_t *emu, uintptr_t fnc);
@@ -1581,6 +1582,7 @@ void iFppuuu(x64emu_t *emu, uintptr_t fnc);
 void iFppuup(x64emu_t *emu, uintptr_t fnc);
 void iFppupi(x64emu_t *emu, uintptr_t fnc);
 void iFppupp(x64emu_t *emu, uintptr_t fnc);
+void iFppUup(x64emu_t *emu, uintptr_t fnc);
 void iFpplii(x64emu_t *emu, uintptr_t fnc);
 void iFppllp(x64emu_t *emu, uintptr_t fnc);
 void iFpplpp(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedgstreamer_private.h b/src/wrapped/wrappedgstreamer_private.h
index 8b6a5e2e..bf436cca 100644
--- a/src/wrapped/wrappedgstreamer_private.h
+++ b/src/wrapped/wrappedgstreamer_private.h
@@ -10,7 +10,7 @@ GO(gst_allocator_alloc, pFpLp)
 GO(gst_allocator_find, pFp)
 //GO(gst_allocator_flags_get_type, 
 //GO(gst_allocator_free, 
-GO(gst_allocator_get_type, pFv)
+GO(gst_allocator_get_type, LFv)
 //GO(gst_allocator_register, 
 //GO(gst_allocator_set_default, 
 //GO(gst_atomic_queue_get_type, 
@@ -24,12 +24,12 @@ GO(gst_atomic_queue_unref, vFp)
 GO(gst_bin_add, iFpp)
 GOM(gst_bin_add_many, vFEppV)
 GO(gst_bin_find_unlinked_pad, pFpi)
-GO(gst_bin_flags_get_type, pFv)
+GO(gst_bin_flags_get_type, LFv)
 GO(gst_bin_get_by_interface, pFpL)
 GO(gst_bin_get_by_name, pFpp)
 GO(gst_bin_get_by_name_recurse_up, pFpp)
 GO(gst_bin_get_suppressed_flags, uFp)
-GO(gst_bin_get_type, pFv)
+GO(gst_bin_get_type, LFv)
 GO(gst_bin_iterate_all_by_element_factory_name, pFpp)
 GO(gst_bin_iterate_all_by_interface, pFpp)
 GO(gst_bin_iterate_elements, pFp)
@@ -43,7 +43,7 @@ GO(gst_bin_remove, iFpp)
 //GOM(gst_bin_remove_many, iFEppV)
 GO(gst_bin_set_suppressed_flags, vFpu)
 GO(gst_bin_sync_children_states, iFp)
-GO(gst_bitmask_get_type, pFv)
+GO(gst_bitmask_get_type, LFv)
 DATAB(_gst_bitmask_type, sizeof(void*))
 GO(gst_buffer_add_meta, pFppp)
 GO(gst_buffer_add_parent_buffer_meta, pFpp)
@@ -54,14 +54,14 @@ GO(gst_buffer_append_memory, vFpp)
 GO(gst_buffer_append_region, pFppll)
 GO(gst_buffer_copy, pFp)
 GO(gst_buffer_copy_deep, pFp)
-GO(gst_buffer_copy_flags_get_type, pFv)
+GO(gst_buffer_copy_flags_get_type, LFv)
 GO(gst_buffer_copy_into, iFppiLL)
 GO(gst_buffer_copy_region, pFpiLL)
 GO(gst_buffer_extract, LFpLpL)
 GO(gst_buffer_extract_dup, vFpLLpp)
 GO(gst_buffer_fill, LFpLpL)
 GO(gst_buffer_find_memory, iFpLLppp)
-GO(gst_buffer_flags_get_type, pFv)
+GO(gst_buffer_flags_get_type, LFv)
 //GOM(gst_buffer_foreach_meta, iFEpBp)
 GO(gst_buffer_get_all_memory, pFp)
 GO(gst_buffer_get_flags, iFp)
@@ -74,9 +74,9 @@ GO(gst_buffer_get_reference_timestamp_meta, pFpp)
 GO(gst_buffer_get_size, LFp)
 GO(gst_buffer_get_sizes, LFppp)
 GO(gst_buffer_get_sizes_range, LFpuipp)
-GO(gst_buffer_get_type, pFv)
+GO(gst_buffer_get_type, LFv)
 GO(gst_buffer_has_flags, iFpi)
-GO(gst_buffering_mode_get_type, pFv)
+GO(gst_buffering_mode_get_type, LFv)
 GO(gst_buffer_insert_memory, vFpip)
 GO(gst_buffer_is_all_memory_writable, iFp)
 GO(gst_buffer_is_memory_range_writable, iFpui)
@@ -158,9 +158,9 @@ GO(gst_bus_async_signal_func, iFppp)
 GO(gst_bus_create_watch, pFp)
 GO(gst_bus_disable_sync_message_emission, vFp)
 GO(gst_bus_enable_sync_message_emission, vFp)
-GO(gst_bus_flags_get_type, pFv)
+GO(gst_bus_flags_get_type, LFv)
 GO(gst_bus_get_pollfd, vFpp)
-GO(gst_bus_get_type, pFv)
+GO(gst_bus_get_type, LFv)
 GO(gst_bus_have_pending, iFp)
 GO(gst_bus_new, pFv)
 GO(gst_bus_peek, pFp)
@@ -172,7 +172,7 @@ GO(gst_bus_remove_signal_watch, vFp)
 GO(gst_bus_remove_watch, iFp)
 GO(gst_bus_set_flushing, vFpi)
 GOM(gst_bus_set_sync_handler, vFEpppp)
-GO(gst_bus_sync_reply_get_type, pFv)
+GO(gst_bus_sync_reply_get_type, LFv)
 GO(gst_bus_sync_signal_handler, iFppp)
 GO(gst_bus_timed_pop, pFpU)
 GO(gst_bus_timed_pop_filtered, pFpUi)
@@ -212,16 +212,16 @@ GO(gst_caps_features_to_string, pFp)
 //DATAB(_gst_caps_features_type, 
 //GO(gst_caps_filter_and_map_in_place, 
 GO(gst_caps_fixate, pFp)
-GO(gst_caps_flags_get_type, pFv)
+GO(gst_caps_flags_get_type, LFv)
 GOM(gst_caps_foreach, iFEppp)
 GO(gst_caps_from_string, pFp)
 GO(gst_caps_get_features, pFpu)
 GO(gst_caps_get_size, uFp)
 GO(gst_caps_get_structure, pFpu)
-GO(gst_caps_get_type, pFv)
+GO(gst_caps_get_type, LFv)
 GO(gst_caps_intersect, pFpp)
 GO(gst_caps_intersect_full, pFppi)
-GO(gst_caps_intersect_mode_get_type, pFv)
+GO(gst_caps_intersect_mode_get_type, LFv)
 GO(gst_caps_is_always_compatible, iFpp)
 GO(gst_caps_is_any, iFp)
 GO(gst_caps_is_empty, iFp)
@@ -546,7 +546,7 @@ GO(gst_element_factory_get_metadata, pFpp)
 GO(gst_element_factory_get_metadata_keys, pFp)
 GO(gst_element_factory_get_num_pad_templates, uFp)
 GO(gst_element_factory_get_static_pad_templates, pFp)
-GO(gst_element_factory_get_type, pFv)
+GO(gst_element_factory_get_type, LFv)
 GO(gst_element_factory_get_uri_protocols, pFp)
 GO(gst_element_factory_get_uri_type, uFp)
 GO(gst_element_factory_has_interface, iFpp)
@@ -554,7 +554,7 @@ GO(gst_element_factory_list_filter, pFppii)
 GO(gst_element_factory_list_get_elements, pFLu)
 GO(gst_element_factory_list_is_type, iFpL)
 GO(gst_element_factory_make, pFpp)
-GO(gst_element_flags_get_type, pFv)
+GO(gst_element_flags_get_type, LFv)
 //GOM(gst_element_foreach_pad, iFEpBp)
 GOM(gst_element_foreach_sink_pad, iFEppp)
 //GOM(gst_element_foreach_src_pad, iFEpBp)
@@ -625,7 +625,7 @@ GO(gst_event_copy_segment, vFpp)
 GO(gst_event_get_running_time_offset, IFp)
 GO(gst_event_get_seqnum, uFp)
 GO(gst_event_get_structure, pFp)
-GO(gst_event_get_type, pFv)
+GO(gst_event_get_type, LFv)
 GO(gst_event_has_name, iFpp)
 GO(gst_event_has_name_id, iFpp)
 GO(gst_event_new_buffer_size, pFiIIi)
@@ -690,10 +690,10 @@ GO(gst_event_set_stream_flags, vFpi)
 GO(gst_event_steal, pFp)
 GO(gst_event_take, iFpp)
 DATAB(_gst_event_type, sizeof(void*))
-GO(gst_event_type_flags_get_type, pFv)
+GO(gst_event_type_flags_get_type, LFv)
 GO(gst_event_type_get_flags, uFu)
 GO(gst_event_type_get_name, pFu)
-GO(gst_event_type_get_type, pFv)
+GO(gst_event_type_get_type, LFv)
 GO(gst_event_type_to_quark, uFu)
 GO(gst_event_unref, vFp)
 GO(gst_event_writable_structure, pFp)
@@ -703,18 +703,18 @@ GO(gst_filename_to_uri, pFpp)
 GO(gst_flagset_register, LFL)
 //DATAB(_gst_flagset_type, 
 GO(gst_flow_get_name, pFi)
-GO(gst_flow_return_get_type, pFv)
+GO(gst_flow_return_get_type, LFv)
 GO(gst_flow_to_quark, uFi)
 GO(gst_format_get_by_nick, uFp)
 GO(gst_format_get_details, pFu)
 GO(gst_format_get_name, pFu)
-GO(gst_format_get_type, pFv)
+GO(gst_format_get_type, LFv)
 GO(gst_format_iterate_definitions, pFv)
 GO(gst_format_register, uFpp)
 GO(gst_formats_contains, iFpu)
 GO(gst_format_to_quark, uFu)
-GO(gst_fraction_get_type, pFv)
-GO(gst_fraction_range_get_type, pFv)
+GO(gst_fraction_get_type, LFv)
+GO(gst_fraction_range_get_type, LFv)
 DATAB(_gst_fraction_range_type, sizeof(void*))
 DATAB(_gst_fraction_type, sizeof(void*))
 GO(gst_get_main_executable_path, pFv)
@@ -784,7 +784,7 @@ GO(gst_message_get_num_redirect_entries, lFp)
 GO(gst_message_get_seqnum, uFp)
 GO(gst_message_get_stream_status_object, pFp)
 GO(gst_message_get_structure, pFp)
-GO(gst_message_get_type, pFv)
+GO(gst_message_get_type, LFv)
 GO(gst_message_has_name, iFpp)
 GO(gst_message_new_application, pFpp)
 GO(gst_message_new_async_done, pFpU)
@@ -881,7 +881,7 @@ GO(gst_message_streams_selected_get_stream, pFpu)
 GO(gst_message_take, iFpp)
 DATAB(_gst_message_type, sizeof(void*))
 GO(gst_message_type_get_name, pFi)
-GO(gst_message_type_get_type, pFv)
+GO(gst_message_type_get_type, LFv)
 GO(gst_message_type_to_quark, uFi)
 GO(gst_message_unref, vFp)
 GO(gst_message_writable_structure, pFp)
@@ -918,14 +918,14 @@ GO(gst_object_add_control_binding, iFpp)
 GO(gst_object_check_uniqueness, iFpp)
 GO(gst_object_default_deep_notify, vFpppp)
 GO(gst_object_default_error, vFppp)
-GO(gst_object_flags_get_type, pFv)
+GO(gst_object_flags_get_type, LFv)
 GO(gst_object_get_control_binding, pFpp)
 GO(gst_object_get_control_rate, LFp)
 GO(gst_object_get_g_value_array, iFppLLup)
 GO(gst_object_get_name, pFp)
 GO(gst_object_get_parent, pFp)
 GO(gst_object_get_path_string, pFp)
-GO(gst_object_get_type, pFv)
+GO(gst_object_get_type, LFv)
 GO(gst_object_get_value, pFppL)
 GO(gst_object_get_value_array, iFppLLup)
 GO(gst_object_has_active_control_bindings, iFp)
@@ -954,9 +954,9 @@ GO(gst_pad_check_reconfigure, iFp)
 GO(gst_pad_create_stream_id, pFppp)
 GOM(gst_pad_create_stream_id_printf, pFEpppV)
 GOM(gst_pad_create_stream_id_printf_valist, pFEpppA)
-GO(gst_pad_direction_get_type, pFv)
+GO(gst_pad_direction_get_type, LFv)
 GO(gst_pad_event_default, iFppp)
-GO(gst_pad_flags_get_type, pFv)
+GO(gst_pad_flags_get_type, LFv)
 //GOM(gst_pad_forward, iFEpBp)
 GO(gst_pad_get_allowed_caps, pFp)
 GO(gst_pad_get_current_caps, pFp)
@@ -970,7 +970,7 @@ GO(gst_pad_get_parent_element, pFp)
 GO(gst_pad_get_peer, pFp)
 GO(gst_pad_get_range, iFpUup)
 GO(gst_pad_get_single_internal_link, pFp)
-GO(gst_pad_get_sticky_event, pFppu)
+GO(gst_pad_get_sticky_event, pFpiu)
 GO(gst_pad_get_stream, pFp)
 GO(gst_pad_get_stream_id, pFp)
 GO(gst_pad_get_task_state, iFp)
@@ -983,15 +983,15 @@ GO(gst_pad_is_linked, iFp)
 GO(gst_pad_iterate_internal_links, pFp)
 GO(gst_pad_iterate_internal_links_default, pFpp)
 GO(gst_pad_link, iFpp)
-GO(gst_pad_link_check_get_type, pFv)
+GO(gst_pad_link_check_get_type, LFv)
 GO(gst_pad_link_full, iFppi)
 GO(gst_pad_link_get_name, pFi)
 GO(gst_pad_link_maybe_ghosting, iFpp)
 GO(gst_pad_link_maybe_ghosting_full, iFppi)
-GO(gst_pad_link_return_get_type, pFv)
+GO(gst_pad_link_return_get_type, LFv)
 GO(gst_pad_mark_reconfigure, vFp)
 GO(gst_pad_mode_get_name, pFu)
-GO(gst_pad_mode_get_type, pFv)
+GO(gst_pad_mode_get_type, LFv)
 GO(gst_pad_needs_reconfigure, iFp)
 GO(gst_pad_new, pFpi)
 GO(gst_pad_new_from_static_template, pFpp)
@@ -1003,7 +1003,7 @@ GO(gst_pad_peer_query_caps, pFpp)
 GO(gst_pad_peer_query_convert, iFpiIip)
 GO(gst_pad_peer_query_duration, iFpip)
 GO(gst_pad_peer_query_position, iFpip)
-GO(gst_pad_presence_get_type, pFv)
+GO(gst_pad_presence_get_type, LFv)
 //GO(gst_pad_probe_info_get_buffer, 
 GO(gst_pad_probe_info_get_buffer_list, pFp)
 //GO(gst_pad_probe_info_get_event, 
@@ -1043,7 +1043,7 @@ GOM(gst_pad_start_task, iFEpppp)
 //GOM(gst_pad_sticky_events_foreach, vFEpBp)
 GO(gst_pad_stop_task, iFp)
 GO(gst_pad_store_sticky_event, iFpp)
-GO(gst_pad_template_flags_get_type, pFv)
+GO(gst_pad_template_flags_get_type, LFv)
 GO(gst_pad_template_get_caps, pFp)
 //GO(gst_pad_template_get_documentation_caps, 
 //GO(gst_pad_template_get_type, 
@@ -1201,7 +1201,7 @@ GO(gst_query_get_n_allocation_pools, uFp)
 GO(gst_query_get_n_buffering_ranges, uFp)
 GO(gst_query_get_n_scheduling_modes, uFp)
 GO(gst_query_get_structure, pFp)
-GO(gst_query_get_type, pFv)
+GO(gst_query_get_type, LFv)
 GO(gst_query_has_scheduling_mode, iFpi)
 GO(gst_query_has_scheduling_mode_with_flags, iFpii)
 GO(gst_query_new_accept_caps, pFp)
@@ -1277,10 +1277,10 @@ GO(gst_query_set_uri_redirection, vFpp)
 GO(gst_query_set_uri_redirection_permanent, vFpi)
 GO(gst_query_take, iFpp)
 //DATAB(_gst_query_type, 
-GO(gst_query_type_flags_get_type, pFv)
+GO(gst_query_type_flags_get_type, LFv)
 GO(gst_query_type_get_flags, uFu)
 GO(gst_query_type_get_name, pFu)
-GO(gst_query_type_get_type, pFv)
+GO(gst_query_type_get_type, LFv)
 GO(gst_query_type_to_quark, uFu)
 GO(gst_query_unref, vFp)
 GO(gst_query_writable_structure, pFp)
@@ -1315,7 +1315,7 @@ GO(gst_sample_get_buffer_list, pFp)
 GO(gst_sample_get_caps, pFp)
 GO(gst_sample_get_info, pFp)
 GO(gst_sample_get_segment, pFp)
-GO(gst_sample_get_type, pFv)
+GO(gst_sample_get_type, LFv)
 GO(gst_sample_new, pFpppp)
 GO(gst_sample_ref, pFp)
 //GO(gst_sample_set_buffer, 
@@ -1325,17 +1325,17 @@ GO(gst_sample_set_info, iFpp)
 GO(gst_sample_set_segment, vFpp)
 DATAB(_gst_sample_type, sizeof(long))
 //GO(gst_sample_unref, 
-GO(gst_scheduling_flags_get_type, pFv)
-GO(gst_search_mode_get_type, pFv)
-GO(gst_seek_flags_get_type, pFv)
-GO(gst_seek_type_get_type, pFv)
+GO(gst_scheduling_flags_get_type, LFv)
+GO(gst_search_mode_get_type, LFv)
+GO(gst_seek_flags_get_type, LFv)
+GO(gst_seek_type_get_type, LFv)
 GO(gst_segment_clip, iFpuLLpp)
 GO(gst_segment_copy, pFp)
 GO(gst_segment_copy_into, vFpp)
 GO(gst_segment_do_seek, iFpduuuLuLp)
-GO(gst_segment_flags_get_type, pFv)
+GO(gst_segment_flags_get_type, LFv)
 GO(gst_segment_free, vFp)
-GO(gst_segment_get_type, pFv)
+GO(gst_segment_get_type, LFv)
 GO(gst_segment_init, vFpu)
 GO(gst_segment_is_equal, iFpp)
 GO(gst_segment_new, pFv)
@@ -1352,14 +1352,14 @@ GO(gst_segment_to_stream_time, UFpiU)
 GO(gst_segment_to_stream_time_full, iFpiUp)
 GO(gst_segtrap_is_enabled, iFv)
 GO(gst_segtrap_set_enabled, vFi)
-GO(gst_stack_trace_flags_get_type, pFv)
+GO(gst_stack_trace_flags_get_type, LFv)
 GO(gst_state_change_get_name, pFu)
-GO(gst_state_change_get_type, pFv)
-GO(gst_state_change_return_get_type, pFv)
-GO(gst_state_get_type, pFv)
+GO(gst_state_change_get_type, LFv)
+GO(gst_state_change_return_get_type, LFv)
+GO(gst_state_get_type, LFv)
 GO(gst_static_caps_cleanup, vFp)
 GO(gst_static_caps_get, pFp)
-GO(gst_static_caps_get_type, pFv)
+GO(gst_static_caps_get_type, LFv)
 GO(gst_static_pad_template_get, pFp)
 GO(gst_static_pad_template_get_caps, pFp)
 GO(gst_static_pad_template_get_type, LFv)
@@ -1417,7 +1417,7 @@ GO(gst_structure_get_list, iFppp)
 GO(gst_structure_get_name, pFp)
 GO(gst_structure_get_name_id, uFp)
 GO(gst_structure_get_string, pFpp)
-GO(gst_structure_get_type, pFv)
+GO(gst_structure_get_type, LFv)
 GO(gst_structure_get_uint, iFppp)
 GO(gst_structure_get_uint64, iFppp)
 GOM(gst_structure_get_valist, iFEppA)
@@ -1501,7 +1501,7 @@ GO(gst_tag_list_get_scope, iFp)
 GO(gst_tag_list_get_string, iFppp)
 GO(gst_tag_list_get_string_index, iFppup)
 GO(gst_tag_list_get_tag_size, uFpp)
-GO(gst_tag_list_get_type, pFv)
+GO(gst_tag_list_get_type, LFv)
 GO(gst_tag_list_get_uint, iFppp)
 GO(gst_tag_list_get_uint64, iFppp)
 GO(gst_tag_list_get_uint64_index, iFppup)
@@ -1526,7 +1526,7 @@ GO(gst_tag_list_take, iFpp)
 GO(gst_tag_list_to_string, pFp)
 DATAB(_gst_tag_list_type, sizeof(void*))
 GO(gst_tag_list_unref, vFp)
-GO(gst_tag_merge_mode_get_type, pFv)
+GO(gst_tag_merge_mode_get_type, LFv)
 //GO(gst_tag_merge_strings_with_comma, 
 //GO(gst_tag_merge_use_first, 
 //GO(gst_tag_register, 
@@ -1546,12 +1546,12 @@ GO(gst_tag_setter_set_tag_merge_mode, vFpu)
 //GO(gst_task_cleanup_all, 
 //GO(gst_task_get_pool, 
 //GO(gst_task_get_state, 
-GO(gst_task_get_type, pFv)
+GO(gst_task_get_type, LFv)
 GO(gst_task_join, iFp)
 GOM(gst_task_new, pFEppp)
 GO(gst_task_pause, iFp)
 GO(gst_task_pool_cleanup, vFp)
-GO(gst_task_pool_get_type, pFv)
+GO(gst_task_pool_get_type, LFv)
 //GO(gst_task_pool_join, 
 //GO(gst_task_pool_new, 
 GO(gst_task_pool_prepare, vFp)
diff --git a/src/wrapped/wrappedgtk3.c b/src/wrapped/wrappedgtk3.c
index cd55ce10..9312415a 100644
--- a/src/wrapped/wrappedgtk3.c
+++ b/src/wrapped/wrappedgtk3.c
@@ -47,6 +47,7 @@ GO(gtk_application_window_get_type, LFv_t)  \
 GO(gtk_bin_get_type, LFv_t)                 \
 GO(gtk_widget_get_type, LFv_t)              \
 GO(gtk_button_get_type, LFv_t)              \
+GO(gtk_menu_button_get_type, LFv_t)         \
 GO(gtk_container_get_type, LFv_t)           \
 GO(gtk_misc_get_type, LFv_t)                \
 GO(gtk_label_get_type, LFv_t)               \
@@ -770,6 +771,7 @@ EXPORT void my3_gtk_clipboard_request_text(x64emu_t* emu, void* clipboard, void*
     SetGtkContainer3ID(my->gtk_container_get_type());           \
     SetGtkBin3ID(my->gtk_bin_get_type());                       \
     SetGtkButton3ID(my->gtk_button_get_type());                 \
+    SetGtkMenuButton3ID(my->gtk_menu_button_get_type());        \
     SetGtkWindow3ID(my->gtk_window_get_type());                 \
     SetGtkApplicationWindowID(my->gtk_application_window_get_type());\
     SetGtkListBoxID(my->gtk_list_box_get_type());               \
diff --git a/src/wrapped/wrappedgtk3_private.h b/src/wrapped/wrappedgtk3_private.h
index a6e4e3ee..9a46b801 100644
--- a/src/wrapped/wrappedgtk3_private.h
+++ b/src/wrapped/wrappedgtk3_private.h
@@ -15,7 +15,7 @@ GO(gtk_about_dialog_get_logo_icon_name, pFp)
 GO(gtk_about_dialog_get_name, pFp)
 GO(gtk_about_dialog_get_program_name, pFp)
 GO(gtk_about_dialog_get_translator_credits, pFp)
-GO(gtk_about_dialog_get_type, pFv)
+GO(gtk_about_dialog_get_type, LFv)
 GO(gtk_about_dialog_get_version, pFp)
 GO(gtk_about_dialog_get_website, pFp)
 GO(gtk_about_dialog_get_website_label, pFp)
@@ -45,7 +45,7 @@ GO(gtk_accelerator_name, pFui)
 GO(gtk_accelerator_parse, vFppp)
 GO(gtk_accelerator_set_default_mod_mask, vFu)
 GO(gtk_accelerator_valid, iFuu)
-GO(gtk_accel_flags_get_type, pFv)
+GO(gtk_accel_flags_get_type, LFv)
 GO(gtk_accel_group_activate, iFpupuu)
 GO(gtk_accel_group_connect, vFpuiip)  // Closure probably needs wrapping when not null
 GO(gtk_accel_group_connect_by_path, vFppp)
@@ -55,7 +55,7 @@ GO(gtk_accel_group_disconnect_key, iFpuu)
 GO(gtk_accel_group_from_accel_closure, pFp)
 GO(gtk_accel_group_get_is_locked, iFp)
 GO(gtk_accel_group_get_modifier_mask, uFp)
-GO(gtk_accel_group_get_type, pFv)
+GO(gtk_accel_group_get_type, LFv)
 GO(gtk_accel_group_lock, vFp)
 GO(gtk_accel_group_new, pFv)
 GO(gtk_accel_group_query, pFpuup)
@@ -64,7 +64,7 @@ GO(gtk_accel_groups_from_object, pFp)
 GO(gtk_accel_group_unlock, vFp)
 GO(gtk_accel_label_get_accel_widget, pFp)
 GO(gtk_accel_label_get_accel_width, uFp)
-GO(gtk_accel_label_get_type, pFv)
+GO(gtk_accel_label_get_type, LFv)
 //GO(gtk_accel_label_new, 
 GO(gtk_accel_label_refetch, iFp)
 //GO(gtk_accel_label_set_accel_closure, 
@@ -75,7 +75,7 @@ GO(gtk_accel_map_change_entry, iFpuui)
 //GO(gtk_accel_map_foreach, 
 //GO(gtk_accel_map_foreach_unfiltered, 
 GO(gtk_accel_map_get, pFv)
-GO(gtk_accel_map_get_type, pFv)
+GO(gtk_accel_map_get_type, LFv)
 //GO(gtk_accel_map_load, 
 //GO(gtk_accel_map_load_fd, 
 //GO(gtk_accel_map_load_scanner, 
@@ -85,12 +85,12 @@ GO(gtk_accel_map_lookup_entry, iFpp)
 GO(gtk_accel_map_save_fd, vFi)
 //GO(gtk_accel_map_unlock_path, 
 //GO(gtk_accessible_connect_widget_destroyed, 
-GO(gtk_accessible_get_type, pFv)
+GO(gtk_accessible_get_type, LFv)
 GO(gtk_accessible_get_widget, pFp)
 GO(gtk_accessible_set_widget, vFpp)
-GO(gtk_actionable_get_type, pFv)
+GO(gtk_actionable_get_type, LFv)
 //GO(gtk_action_activate, 
-GO(gtk_action_bar_get_type, pFv)
+GO(gtk_action_bar_get_type, LFv)
 //GO(gtk_action_block_activate, 
 //GO(gtk_action_block_activate_from, 
 //GO(gtk_action_connect_accelerator, 
@@ -114,7 +114,7 @@ GO(gtk_action_get_proxies, pFp)
 //GO(gtk_action_get_short_label, 
 //GO(gtk_action_get_stock_id, 
 //GO(gtk_action_get_tooltip, 
-GO(gtk_action_get_type, pFv)
+GO(gtk_action_get_type, LFv)
 //GO(gtk_action_get_visible, 
 //GO(gtk_action_get_visible_horizontal, 
 //GO(gtk_action_get_visible_vertical, 
@@ -129,7 +129,7 @@ GO(gtk_action_group_add_action_with_accel, vFppp)
 GO(gtk_action_group_get_action, pFpp)
 GO(gtk_action_group_get_name, pFp)
 //GO(gtk_action_group_get_sensitive, 
-GO(gtk_action_group_get_type, pFv)
+GO(gtk_action_group_get_type, LFv)
 GO(gtk_action_group_get_visible, iFp)
 GO(gtk_action_group_list_actions, pFp)
 GO(gtk_action_group_new, pFp)
@@ -160,7 +160,7 @@ GO(gtk_action_set_icon_name, vFpp)
 //GO(gtk_action_unblock_activate_from, 
 GO(gtk_activatable_do_set_related_action, vFpp)
 GO(gtk_activatable_get_related_action, pFp)
-GO(gtk_activatable_get_type, pFv)
+GO(gtk_activatable_get_type, LFv)
 GO(gtk_activatable_get_use_action_appearance, iFp)
 //GO(gtk_activatable_set_related_action, 
 GO(gtk_activatable_set_use_action_appearance, vFpi)
@@ -172,7 +172,7 @@ GO(gtk_adjustment_get_lower, dFp)
 GO(gtk_adjustment_get_page_increment, dFp)
 GO(gtk_adjustment_get_page_size, dFp)
 GO(gtk_adjustment_get_step_increment, dFp)
-GO(gtk_adjustment_get_type, pFv)
+GO(gtk_adjustment_get_type, LFv)
 GO(gtk_adjustment_get_upper, dFp)
 GO(gtk_adjustment_get_value, dFp)
 GO(gtk_adjustment_new, pFdddddd)
@@ -184,31 +184,31 @@ GO(gtk_adjustment_set_upper, vFpd)
 GO(gtk_adjustment_set_value, vFpd)
 GO(gtk_adjustment_value_changed, vFp)
 GO(gtk_alignment_get_padding, vFppppp)
-GO(gtk_alignment_get_type, pFv)
+GO(gtk_alignment_get_type, LFv)
 GO(gtk_alignment_new, pFffff)
 GO(gtk_alignment_set, vFpffff)
 GO(gtk_alignment_set_padding, vFpuuuu)
-GO(gtk_align_get_type, pFv)
+GO(gtk_align_get_type, LFv)
 GO(gtk_alternative_dialog_button_order, iFp)
-GO(gtk_anchor_type_get_type, pFv)
+GO(gtk_anchor_type_get_type, LFv)
 GO(gtk_application_add_window, vFpp)
 GO(gtk_application_get_new, pFpi)
 GO(gtk_application_get_type, LFv)
 GO(gtk_application_new, pFpu)
 GO(gtk_application_set_accels_for_action, vFppp)
 GO(gtk_application_window_new, pFp)
-GO(gtk_application_window_get_type, pFv)
-GO(gtk_app_chooser_button_get_type, pFv)
-GO(gtk_app_chooser_dialog_get_type, pFv)
-GO(gtk_app_chooser_get_type, pFv)
-GO(gtk_app_chooser_widget_get_type, pFv)
-GO(gtk_arg_flags_get_type, pFv)
-GO(gtk_arrow_get_type, pFv)
+GO(gtk_application_window_get_type, LFv)
+GO(gtk_app_chooser_button_get_type, LFv)
+GO(gtk_app_chooser_dialog_get_type, LFv)
+GO(gtk_app_chooser_get_type, LFv)
+GO(gtk_app_chooser_widget_get_type, LFv)
+GO(gtk_arg_flags_get_type, LFv)
+GO(gtk_arrow_get_type, LFv)
 GO(gtk_arrow_new, pFuu)
-GO(gtk_arrow_placement_get_type, pFv)
+GO(gtk_arrow_placement_get_type, LFv)
 GO(gtk_arrow_set, vFpuu)
-GO(gtk_arrow_type_get_type, pFv)
-GO(gtk_aspect_frame_get_type, pFv)
+GO(gtk_arrow_type_get_type, LFv)
+GO(gtk_aspect_frame_get_type, LFv)
 GO(gtk_aspect_frame_new, pFpfffi)
 GO(gtk_aspect_frame_set, vFpfffi)
 //GO(gtk_assistant_add_action_widget, 
@@ -222,10 +222,10 @@ GO(gtk_assistant_get_nth_page, pFpi)
 GO(gtk_assistant_get_page_side_image, pFpp)
 GO(gtk_assistant_get_page_title, pFpp)
 GO(gtk_assistant_get_page_type, uFpp)
-GO(gtk_assistant_get_type, pFv)
+GO(gtk_assistant_get_type, LFv)
 GO(gtk_assistant_insert_page, iFppi)
 //GO(gtk_assistant_new, 
-GO(gtk_assistant_page_type_get_type, pFv)
+GO(gtk_assistant_page_type_get_type, LFv)
 //GO(gtk_assistant_prepend_page, 
 GO(gtk_assistant_remove_action_widget, vFpp)
 //GO(gtk_assistant_set_current_page, 
@@ -236,7 +236,7 @@ GO(gtk_assistant_set_page_side_image, vFppp)
 GO(gtk_assistant_set_page_title, vFppp)
 GO(gtk_assistant_set_page_type, vFppu)
 //GO(gtk_assistant_update_buttons_state, 
-GO(gtk_attach_options_get_type, pFv)
+GO(gtk_attach_options_get_type, LFv)
 //GO(gtk_binding_entry_add_signal, 
 GO(gtk_binding_entry_add_signall, vFpuupp)
 //GO(gtk_binding_entry_clear, 
@@ -251,14 +251,14 @@ GO(gtk_binding_set_by_class, pFp)
 GO(gtk_binding_set_find, pFp)
 //GO(gtk_binding_set_new, 
 GO(gtk_bin_get_child, pFp)
-GO(gtk_bin_get_type, pFv)
+GO(gtk_bin_get_type, LFv)
 GO(gtk_border_copy, pFp)
 GO(gtk_border_free, vFp)
-GO(gtk_border_get_type, pFv)
+GO(gtk_border_get_type, LFv)
 GO(gtk_border_new, pFv)
 GO(gtk_box_get_homogeneous, iFp)
 GO(gtk_box_get_spacing, iFp)
-GO(gtk_box_get_type, pFv)
+GO(gtk_box_get_type, LFv)
 GO(gtk_box_new, pFui)
 GO(gtk_box_pack_end, vFppiiu)
 GO(gtk_box_pack_end_defaults, vFpp)
@@ -276,7 +276,7 @@ GO(gtk_buildable_custom_tag_end, vFppppp)
 GO(gtk_buildable_custom_tag_start, iFpppppp)
 GO(gtk_buildable_get_internal_child, pFppp)
 GO(gtk_buildable_get_name, pFp)
-GO(gtk_buildable_get_type, pFv)
+GO(gtk_buildable_get_type, LFv)
 GO(gtk_buildable_parser_finished, vFpp)
 GO(gtk_buildable_set_buildable_property, vFpppp)
 GO(gtk_buildable_set_name, vFpp)
@@ -287,29 +287,29 @@ GO(gtk_builder_add_objects_from_file, uFpppp)
 GO(gtk_builder_add_objects_from_string, uFppLpp)
 GOM(gtk_builder_connect_signals, vFEpp)
 GOM(gtk_builder_connect_signals_full, vFEppp)
-GO(gtk_builder_error_get_type, pFv)
+GO(gtk_builder_error_get_type, LFv)
 GO(gtk_builder_error_quark, pFv)
 GO(gtk_builder_get_object, pFpp)
 GO(gtk_builder_get_objects, pFp)
 GO(gtk_builder_get_translation_domain, pFp)
-GO(gtk_builder_get_type, pFv)
+GO(gtk_builder_get_type, LFv)
 GO(gtk_builder_get_type_from_name, LFpp)
 GO(gtk_builder_new, pFv)
 GO(gtk_builder_set_translation_domain, vFpp)
 GO(gtk_builder_value_from_string, iFppppp)
 GO(gtk_builder_value_from_string_type, iFpLppp)
-GO(gtk_button_action_get_type, pFv)
+GO(gtk_button_action_get_type, LFv)
 GO(gtk_button_box_get_child_ipadding, vFppp)
 GO(gtk_button_box_get_child_secondary, iFpp)
 GO(gtk_button_box_get_child_size, vFppp)
 GO(gtk_button_box_get_layout, uFp)
-GO(gtk_button_box_get_type, pFv)
+GO(gtk_button_box_get_type, LFv)
 GO(gtk_button_box_new, pFi)
 GO(gtk_button_box_set_child_ipadding, vFpii)
 GO(gtk_button_box_set_child_secondary, vFppi)
 GO(gtk_button_box_set_child_size, vFpii)
 GO(gtk_button_box_set_layout, vFpu)
-GO(gtk_button_box_style_get_type, pFv)
+GO(gtk_button_box_style_get_type, LFv)
 //GO(gtk_button_clicked, 
 //GO(gtk_button_enter, 
 GO(gtk_button_get_alignment, vFppp)
@@ -319,7 +319,7 @@ GO(gtk_button_get_image, pFp)
 GO(gtk_button_get_image_position, uFp)
 GO(gtk_button_get_label, pFp)
 GO(gtk_button_get_relief, uFp)
-GO(gtk_button_get_type, pFv)
+GO(gtk_button_get_type, LFv)
 GO(gtk_button_get_use_stock, iFp)
 GO(gtk_button_get_use_underline, iFp)
 GO(gtk_button_leave, vFp)
@@ -337,16 +337,16 @@ GO(gtk_button_set_label, vFpp)
 GO(gtk_button_set_relief, vFpu)
 GO(gtk_button_set_use_stock, vFpi)
 GO(gtk_button_set_use_underline, vFpi)
-GO(gtk_buttons_type_get_type, pFv)
+GO(gtk_buttons_type_get_type, LFv)
 //GO(gtk_calendar_clear_marks, 
 //GO(gtk_calendar_display_options, 
-GO(gtk_calendar_display_options_get_type, pFv)
+GO(gtk_calendar_display_options_get_type, LFv)
 //GO(gtk_calendar_freeze, 
 GO(gtk_calendar_get_date, vFpppp)
 GO(gtk_calendar_get_detail_height_rows, iFp)
 //GO(gtk_calendar_get_detail_width_chars, 
 GO(gtk_calendar_get_display_options, uFp)
-GO(gtk_calendar_get_type, pFv)
+GO(gtk_calendar_get_type, LFv)
 //GO(gtk_calendar_mark_day, 
 //GO(gtk_calendar_new, 
 //GO(gtk_calendar_select_day, 
@@ -358,24 +358,24 @@ GO(gtk_calendar_set_display_options, vFpu)
 //GO(gtk_calendar_thaw, 
 GO(gtk_calendar_unmark_day, vFpu)
 //GO(gtk_cell_editable_editing_done, 
-GO(gtk_cell_editable_get_type, pFv)
+GO(gtk_cell_editable_get_type, LFv)
 //GO(gtk_cell_editable_remove_widget, 
 GO(gtk_cell_editable_start_editing, vFpp)
 GO(gtk_cell_layout_add_attribute, vFpppi)
 GO(gtk_cell_layout_clear, vFp)
 GO(gtk_cell_layout_clear_attributes, vFpp)
 GO(gtk_cell_layout_get_cells, pFp)
-GO(gtk_cell_layout_get_type, pFv)
+GO(gtk_cell_layout_get_type, LFv)
 GO(gtk_cell_layout_pack_end, vFppi)
 GO(gtk_cell_layout_pack_start, vFppi)
 GO(gtk_cell_layout_reorder, vFppi)
 GO(gtk_cell_layout_set_attributes, vFpppppppppp)  // vaarg
 //GOM(gtk_cell_layout_set_cell_data_func, vFEppppp)
-GO(gtk_cell_renderer_accel_get_type, pFv)
-GO(gtk_cell_renderer_accel_mode_get_type, pFv)
+GO(gtk_cell_renderer_accel_get_type, LFv)
+GO(gtk_cell_renderer_accel_mode_get_type, LFv)
 //GO(gtk_cell_renderer_accel_new, 
 GO(gtk_cell_renderer_activate, iFppppppu)
-GO(gtk_cell_renderer_combo_get_type, pFv)
+GO(gtk_cell_renderer_combo_get_type, LFv)
 //GO(gtk_cell_renderer_combo_new, 
 //GO(gtk_cell_renderer_editing_canceled, 
 GO(gtk_cell_renderer_get_alignment, vFppp)
@@ -383,12 +383,12 @@ GO(gtk_cell_renderer_get_alignment, vFppp)
 GO(gtk_cell_renderer_get_padding, vFppp)
 //GO(gtk_cell_renderer_get_sensitive, 
 GO(gtk_cell_renderer_get_size, vFppppppp)
-GO(gtk_cell_renderer_get_type, pFv)
+GO(gtk_cell_renderer_get_type, LFv)
 //GO(gtk_cell_renderer_get_visible, 
-GO(gtk_cell_renderer_mode_get_type, pFv)
-GO(gtk_cell_renderer_pixbuf_get_type, pFv)
+GO(gtk_cell_renderer_mode_get_type, LFv)
+GO(gtk_cell_renderer_pixbuf_get_type, LFv)
 GO(gtk_cell_renderer_pixbuf_new, pFv)
-GO(gtk_cell_renderer_progress_get_type, pFv)
+GO(gtk_cell_renderer_progress_get_type, LFv)
 //GO(gtk_cell_renderer_progress_new, 
 GO(gtk_cell_renderer_render, vFpppppu)
 GO(gtk_cell_renderer_set_alignment, vFpff)
@@ -396,30 +396,30 @@ GO(gtk_cell_renderer_set_alignment, vFpff)
 GO(gtk_cell_renderer_set_padding, vFpii)
 //GO(gtk_cell_renderer_set_sensitive, 
 //GO(gtk_cell_renderer_set_visible, 
-GO(gtk_cell_renderer_spin_get_type, pFv)
-GO(gtk_cell_renderer_spinner_get_type, pFv)
+GO(gtk_cell_renderer_spin_get_type, LFv)
+GO(gtk_cell_renderer_spinner_get_type, LFv)
 //GO(gtk_cell_renderer_spinner_new, 
 //GO(gtk_cell_renderer_spin_new, 
 GO(gtk_cell_renderer_start_editing, pFppppppu)
-GO(gtk_cell_renderer_state_get_type, pFv)
+GO(gtk_cell_renderer_state_get_type, LFv)
 GO(gtk_cell_renderer_stop_editing, vFpi)
-GO(gtk_cell_renderer_text_get_type, pFv)
+GO(gtk_cell_renderer_text_get_type, LFv)
 GO(gtk_cell_renderer_text_new, pFv)
 GO(gtk_cell_renderer_text_set_fixed_height_from_font, vFpi)
 GO(gtk_cell_renderer_toggle_get_activatable, iFp)
 GO(gtk_cell_renderer_toggle_get_active, iFp)
 GO(gtk_cell_renderer_toggle_get_radio, iFp)
-GO(gtk_cell_renderer_toggle_get_type, pFv)
+GO(gtk_cell_renderer_toggle_get_type, LFv)
 GO(gtk_cell_renderer_toggle_new, pFv)
 GO(gtk_cell_renderer_toggle_set_activatable, vFpi)
 GO(gtk_cell_renderer_toggle_set_active, vFpi)
 GO(gtk_cell_renderer_toggle_set_radio, vFpi)
-GO(gtk_cell_type_get_type, pFv)
+GO(gtk_cell_type_get_type, LFv)
 //GO(gtk_cell_view_get_cell_renderers, 
 GO(gtk_cell_view_get_displayed_row, pFp)
 GO(gtk_cell_view_get_model, pFp)
 GO(gtk_cell_view_get_size_of_row, iFppp)
-GO(gtk_cell_view_get_type, pFv)
+GO(gtk_cell_view_get_type, LFv)
 //GO(gtk_cell_view_new, 
 //GO(gtk_cell_view_new_with_markup, 
 GO(gtk_cell_view_new_with_pixbuf, pFp)
@@ -427,14 +427,14 @@ GO(gtk_cell_view_new_with_pixbuf, pFp)
 GO(gtk_cell_view_set_background_color, vFpp)
 GO(gtk_cell_view_set_displayed_row, vFpp)
 GO(gtk_cell_view_set_model, vFpp)
-GO(gtk_check_button_get_type, pFv)
+GO(gtk_check_button_get_type, LFv)
 GO(gtk_check_button_new, pFv)
 GO(gtk_check_button_new_with_label, pFp)
 GO(gtk_check_button_new_with_mnemonic, pFp)
 GO(gtk_check_menu_item_get_active, iFp)
 GO(gtk_check_menu_item_get_draw_as_radio, iFp)
 GO(gtk_check_menu_item_get_inconsistent, iFp)
-GO(gtk_check_menu_item_get_type, pFv)
+GO(gtk_check_menu_item_get_type, LFv)
 GO(gtk_check_menu_item_new, pFv)
 GO(gtk_check_menu_item_new_with_label, pFp)
 GO(gtk_check_menu_item_new_with_mnemonic, pFp)
@@ -450,7 +450,7 @@ GO(gtk_clipboard_get_default, pFp)
 GO(gtk_clipboard_get_display, pFp)
 GO(gtk_clipboard_get_for_display, pFpp)
 GO(gtk_clipboard_get_owner, pFp)
-GO(gtk_clipboard_get_type, pFv)
+GO(gtk_clipboard_get_type, LFv)
 //GOM(gtk_clipboard_request_contents, vFEpppp)
 //GOM(gtk_clipboard_request_image, vFEppp)
 //GOM(gtk_clipboard_request_rich_text, vFEpppp)
@@ -483,7 +483,7 @@ GO(gtk_clist_column_titles_active, vFp)
 GO(gtk_clist_column_titles_hide, vFp)
 GO(gtk_clist_column_titles_passive, vFp)
 GO(gtk_clist_column_titles_show, vFp)
-GO(gtk_clist_drag_pos_get_type, pFv)
+GO(gtk_clist_drag_pos_get_type, LFv)
 GO(gtk_clist_find_row_from_data, iFpp)
 GO(gtk_clist_freeze, vFp)
 GO(gtk_clist_get_cell_style, pFpii)
@@ -498,7 +498,7 @@ GO(gtk_clist_get_row_style, pFpi)
 GO(gtk_clist_get_selectable, iFpi)
 GO(gtk_clist_get_selection_info, iFpiipp)
 GO(gtk_clist_get_text, iFpiip)
-GO(gtk_clist_get_type, pFv)
+GO(gtk_clist_get_type, LFv)
 GO(gtk_clist_get_vadjustment, pFp)
 GO(gtk_clist_insert, iFpip)
 GO(gtk_clist_moveto, vFpiiff)
@@ -552,7 +552,7 @@ GO(gtk_clist_unselect_row, vFpii)
 GO(gtk_color_button_get_alpha, WFp)
 GO(gtk_color_button_get_color, vFpp)
 GO(gtk_color_button_get_title, pFp)
-GO(gtk_color_button_get_type, pFv)
+GO(gtk_color_button_get_type, LFv)
 GO(gtk_color_button_get_use_alpha, iFp)
 GO(gtk_color_button_new, pFv)
 GO(gtk_color_button_new_with_color, pFp)
@@ -560,10 +560,10 @@ GO(gtk_color_button_set_alpha, vFpW)
 GO(gtk_color_button_set_color, vFpp)
 GO(gtk_color_button_set_title, vFpp)
 GO(gtk_color_button_set_use_alpha, vFpi)
-GO(gtk_color_chooser_dialog_get_type, pFv)
-GO(gtk_color_chooser_get_type, pFv)
+GO(gtk_color_chooser_dialog_get_type, LFv)
+GO(gtk_color_chooser_get_type, LFv)
 GO(gtk_color_selection_dialog_get_color_selection, pFp)
-GO(gtk_color_selection_dialog_get_type, pFv)
+GO(gtk_color_selection_dialog_get_type, LFv)
 GO(gtk_color_selection_dialog_new, pFp)
 GO(gtk_color_selection_get_color, vFpp)
 GO(gtk_color_selection_get_current_alpha, WFp)
@@ -572,7 +572,7 @@ GO(gtk_color_selection_get_has_opacity_control, iFp)
 GO(gtk_color_selection_get_has_palette, iFp)
 GO(gtk_color_selection_get_previous_alpha, WFp)
 GO(gtk_color_selection_get_previous_color, vFpp)
-GO(gtk_color_selection_get_type, pFv)
+GO(gtk_color_selection_get_type, LFv)
 GO(gtk_color_selection_is_adjusting, iFp)
 GO(gtk_color_selection_new, pFv)
 GO(gtk_color_selection_palette_from_string, iFppp)
@@ -589,7 +589,7 @@ GO(gtk_color_selection_set_previous_color, vFpp)
 GO(gtk_color_selection_set_update_policy, vFpi)
 GO(gtk_combo_box_append_text, vFpp)
 GO(gtk_combo_box_entry_get_text_column, iFp)
-GO(gtk_combo_box_entry_get_type, pFv)
+GO(gtk_combo_box_entry_get_type, LFv)
 GO(gtk_combo_box_entry_new, pFv)
 GO(gtk_combo_box_entry_new_text, pFv)
 GO(gtk_combo_box_entry_new_with_model, pFpi)
@@ -608,7 +608,7 @@ GO(gtk_combo_box_get_popup_accessible, pFp)
 //GOM(gtk_combo_box_get_row_separator_func, pFEp)
 GO(gtk_combo_box_get_row_span_column, iFp)
 GO(gtk_combo_box_get_title, pFp)
-GO(gtk_combo_box_get_type, pFv)
+GO(gtk_combo_box_get_type, LFv)
 GO(gtk_combo_box_get_wrap_width, iFp)
 GO(gtk_combo_box_insert_text, vFpip)
 GO(gtk_combo_box_new, pFv)
@@ -635,7 +635,7 @@ GO(gtk_combo_box_set_wrap_width, vFpi)
 GO(gtk_combo_box_text_append, vFppp)
 GO(gtk_combo_box_text_append_text, vFpp)
 GO(gtk_combo_box_text_get_active_text, pFp)
-GO(gtk_combo_box_text_get_type, pFv)
+GO(gtk_combo_box_text_get_type, LFv)
 GO(gtk_combo_box_text_insert_text, vFpip)
 GO(gtk_combo_box_text_new, pFv)
 GO(gtk_combo_box_text_new_with_entry, pFv)
@@ -643,7 +643,7 @@ GO(gtk_combo_box_text_prepend_text, vFpp)
 GO(gtk_combo_box_text_remove, vFpi)
 GO(gtk_combo_box_text_remove_all, vFp)
 GO(gtk_combo_disable_activate, vFp)
-GO(gtk_combo_get_type, pFv)
+GO(gtk_combo_get_type, LFv)
 GO(gtk_combo_new, pFv)
 GO(gtk_combo_set_case_sensitive, vFpi)
 GO(gtk_combo_set_item_string, vFppp)
@@ -675,7 +675,7 @@ GO(gtk_container_get_focus_child, pFp)
 GO(gtk_container_get_focus_hadjustment, pFp)
 GO(gtk_container_get_focus_vadjustment, pFp)
 GO(gtk_container_get_resize_mode, uFp)
-GO(gtk_container_get_type, pFv)
+GO(gtk_container_get_type, LFv)
 GO(gtk_container_propagate_expose, vFppp)
 GO(gtk_container_remove, vFpp)
 GO(gtk_container_resize_children, vFp)
@@ -687,7 +687,7 @@ GO(gtk_container_set_focus_vadjustment, vFpp)
 GO(gtk_container_set_reallocate_redraws, vFpi)
 GO(gtk_container_set_resize_mode, vFpu)
 GO(gtk_container_unset_focus_chain, vFp)
-GO(gtk_corner_type_get_type, pFv)
+GO(gtk_corner_type_get_type, LFv)
 GO(gtk_css_provider_get_default, pFv)
 GO(gtk_css_provider_get_named, pFpp)
 GO(gtk_css_provider_load_from_data, iFpplp)
@@ -709,10 +709,10 @@ GO(gtk_css_section_unref, vFp)
 //GO(gtk_ctree_collapse_recursive, 
 //GO(gtk_ctree_collapse_to_depth, 
 //GO(gtk_ctree_expand, 
-GO(gtk_ctree_expander_style_get_type, pFv)
+GO(gtk_ctree_expander_style_get_type, LFv)
 //GO(gtk_ctree_expand_recursive, 
 //GO(gtk_ctree_expand_to_depth, 
-GO(gtk_ctree_expansion_type_get_type, pFv)
+GO(gtk_ctree_expansion_type_get_type, LFv)
 //GO(gtk_ctree_export_to_gnode, 
 //GO(gtk_ctree_find, 
 //GO(gtk_ctree_find_all_by_row_data, 
@@ -721,14 +721,14 @@ GO(gtk_ctree_expansion_type_get_type, pFv)
 //GO(gtk_ctree_find_by_row_data_custom, 
 //GO(gtk_ctree_find_node_ptr, 
 //GO(gtk_ctree_get_node_info, 
-GO(gtk_ctree_get_type, pFv)
+GO(gtk_ctree_get_type, LFv)
 //GO(gtk_ctree_insert_gnode, 
 //GO(gtk_ctree_insert_node, 
 //GO(gtk_ctree_is_ancestor, 
 //GO(gtk_ctree_is_hot_spot, 
 //GO(gtk_ctree_is_viewable, 
 //GO(gtk_ctree_last, 
-GO(gtk_ctree_line_style_get_type, pFv)
+GO(gtk_ctree_line_style_get_type, LFv)
 //GO(gtk_ctree_move, 
 //GO(gtk_ctree_new, 
 //GO(gtk_ctree_new_with_titles, 
@@ -740,7 +740,7 @@ GO(gtk_ctree_line_style_get_type, pFv)
 //GO(gtk_ctree_node_get_row_style, 
 //GO(gtk_ctree_node_get_selectable, 
 //GO(gtk_ctree_node_get_text, 
-GO(gtk_ctree_node_get_type, pFv)
+GO(gtk_ctree_node_get_type, LFv)
 //GO(gtk_ctree_node_is_visible, 
 //GO(gtk_ctree_node_moveto, 
 //GO(gtk_ctree_node_nth, 
@@ -755,7 +755,7 @@ GO(gtk_ctree_node_get_type, pFv)
 //GO(gtk_ctree_node_set_selectable, 
 //GO(gtk_ctree_node_set_shift, 
 //GO(gtk_ctree_node_set_text, 
-GO(gtk_ctree_pos_get_type, pFv)
+GO(gtk_ctree_pos_get_type, LFv)
 //GO(gtk_ctree_post_recursive, 
 //GO(gtk_ctree_post_recursive_to_depth, 
 //GO(gtk_ctree_pre_recursive, 
@@ -777,7 +777,7 @@ GO(gtk_ctree_pos_get_type, pFv)
 //GO(gtk_ctree_toggle_expansion_recursive, 
 //GO(gtk_ctree_unselect, 
 //GO(gtk_ctree_unselect_recursive, 
-GO(gtk_curve_get_type, pFv)
+GO(gtk_curve_get_type, LFv)
 GO(gtk_curve_get_vector, vFpip)
 GO(gtk_curve_new, pFv)
 GO(gtk_curve_reset, vFp)
@@ -785,24 +785,24 @@ GO(gtk_curve_set_curve_type, vFpi)
 GO(gtk_curve_set_gamma, vFpf)
 GO(gtk_curve_set_range, vFpffff)
 GO(gtk_curve_set_vector, vFpip)
-GO(gtk_curve_type_get_type, pFv)
-GO(gtk_custom_paper_unix_dialog_get_type, pFv)
-GO(gtk_debug_flag_get_type, pFv)
+GO(gtk_curve_type_get_type, LFv)
+GO(gtk_custom_paper_unix_dialog_get_type, LFv)
+GO(gtk_debug_flag_get_type, LFv)
 GO(gtk_decorated_window_calculate_frame_size, vFp)
 GO(gtk_decorated_window_init, vFp)
 GO(gtk_decorated_window_move_resize_window, vFpiiii)
 GO(gtk_decorated_window_set_title, vFpp)
-GO(gtk_delete_type_get_type, pFv)
-GO(gtk_dest_defaults_get_type, pFv)
+GO(gtk_delete_type_get_type, LFv)
+GO(gtk_dest_defaults_get_type, LFv)
 GO(gtk_dialog_add_action_widget, vFppi)
 GO(gtk_dialog_add_button, pFppi)
 GOM(gtk_dialog_add_buttons, vFEppV)
-GO(gtk_dialog_flags_get_type, pFv)
+GO(gtk_dialog_flags_get_type, LFv)
 GO(gtk_dialog_get_action_area, pFp)
 GO(gtk_dialog_get_content_area, pFp)
 GO(gtk_dialog_get_has_separator, iFp)
 GO(gtk_dialog_get_response_for_widget, iFpp)
-GO(gtk_dialog_get_type, pFv)
+GO(gtk_dialog_get_type, LFv)
 GO(gtk_dialog_get_widget_for_response, pFpi)
 GO(gtk_dialog_new, pFv)
 GO(gtk_dialog_new_with_buttons, pFppipppppppppppp)    //vaarg
@@ -813,7 +813,7 @@ GO(gtk_dialog_set_alternative_button_order_from_array, vFpip)
 GO(gtk_dialog_set_default_response, vFpi)
 GO(gtk_dialog_set_has_separator, vFpi)
 GO(gtk_dialog_set_response_sensitive, vFpii)
-GO(gtk_direction_type_get_type, pFv)
+GO(gtk_direction_type_get_type, LFv)
 GO(gtk_disable_setlocale, vFv)
 GO(gtk_distribute_natural_allocation, iFiup)
 GO(gtk_drag_begin, pFppuip)
@@ -833,7 +833,7 @@ GO(gtk_drag_finish, vFpiiu)
 GO(gtk_drag_get_data, vFpppu)
 GO(gtk_drag_get_source_widget, pFp)
 GO(gtk_drag_highlight, vFp)
-GO(gtk_drag_result_get_type, pFv)
+GO(gtk_drag_result_get_type, LFv)
 GO(gtk_drag_set_default_icon, vFpppii)
 GO(gtk_drag_set_icon_default, vFp)
 GO(gtk_drag_set_icon_name, vFppii)
@@ -864,7 +864,7 @@ GO(gtk_draw_flat_box, vFppiiiiii)
 GO(gtk_draw_focus, vFppiiii)
 GO(gtk_draw_handle, vFppiiiiiii)
 GO(gtk_draw_hline, vFppiiii)
-GO(gtk_drawing_area_get_type, pFv)
+GO(gtk_drawing_area_get_type, LFv)
 GO(gtk_drawing_area_new, pFv)
 GO(gtk_drawing_area_size, vFpii)
 GO(gtk_draw_insertion_cursor, vFpppiui)
@@ -886,7 +886,7 @@ GO(gtk_editable_get_chars, pFpii)
 GO(gtk_editable_get_editable, iFp)
 GO(gtk_editable_get_position, iFp)
 GO(gtk_editable_get_selection_bounds, iFppp)
-GO(gtk_editable_get_type, pFv)
+GO(gtk_editable_get_type, LFv)
 GO(gtk_editable_insert_text, vFppip)
 GO(gtk_editable_paste_clipboard, vFp)
 GO(gtk_editable_select_region, vFpii)
@@ -900,7 +900,7 @@ GO(gtk_entry_buffer_get_bytes, LFp)
 GO(gtk_entry_buffer_get_length, uFp)
 GO(gtk_entry_buffer_get_max_length, iFp)
 GO(gtk_entry_buffer_get_text, pFp)
-GO(gtk_entry_buffer_get_type, pFv)
+GO(gtk_entry_buffer_get_type, LFv)
 GO(gtk_entry_buffer_insert_text, uFpupi)
 GO(gtk_entry_buffer_new, pFpi)
 GO(gtk_entry_buffer_set_max_length, vFpi)
@@ -917,7 +917,7 @@ GO(gtk_entry_completion_get_model, pFp)
 //GO(gtk_entry_completion_get_popup_set_width, 
 GO(gtk_entry_completion_get_popup_single_match, iFp)
 GO(gtk_entry_completion_get_text_column, iFp)
-GO(gtk_entry_completion_get_type, pFv)
+GO(gtk_entry_completion_get_type, LFv)
 GO(gtk_entry_completion_insert_action_markup, vFpip)
 //GO(gtk_entry_completion_insert_action_text, 
 //GO(gtk_entry_completion_insert_prefix, 
@@ -960,10 +960,10 @@ GO(gtk_entry_get_progress_pulse_step, dFp)
 GO(gtk_entry_get_text, pFp)
 GO(gtk_entry_get_text_length, WFp)
 //GO(gtk_entry_get_text_window, 
-GO(gtk_entry_get_type, pFv)
+GO(gtk_entry_get_type, LFv)
 //GO(gtk_entry_get_visibility, 
 GO(gtk_entry_get_width_chars, iFp)
-GO(gtk_entry_icon_position_get_type, pFv)
+GO(gtk_entry_icon_position_get_type, LFv)
 GO(gtk_entry_im_context_filter_keypress, iFpp)
 //GO(gtk_entry_layout_index_to_text_index, 
 GO(gtk_entry_new, pFv)
@@ -1003,7 +1003,7 @@ GO(gtk_entry_text_index_to_layout_index, iFpi)
 //GO(gtk_entry_unset_invisible_char, 
 GOM(gtk_enumerate_printers, vFEpppi)
 GO(gtk_event_box_get_above_child, iFp)
-GO(gtk_event_box_get_type, pFv)
+GO(gtk_event_box_get_type, LFv)
 GO(gtk_event_box_get_visible_window, iFp)
 GO(gtk_event_box_new, pFv)
 GO(gtk_event_box_set_above_child, vFpi)
@@ -1015,7 +1015,7 @@ GO(gtk_expander_get_label, pFp)
 GO(gtk_expander_get_label_fill, iFp)
 GO(gtk_expander_get_label_widget, pFp)
 GO(gtk_expander_get_spacing, iFp)
-GO(gtk_expander_get_type, pFv)
+GO(gtk_expander_get_type, LFv)
 GO(gtk_expander_get_use_markup, iFp)
 GO(gtk_expander_get_use_underline, iFp)
 GO(gtk_expander_new, pFp)
@@ -1027,15 +1027,15 @@ GO(gtk_expander_set_label_widget, vFpp)
 GO(gtk_expander_set_spacing, vFpi)
 GO(gtk_expander_set_use_markup, vFpi)
 GO(gtk_expander_set_use_underline, vFpi)
-GO(gtk_expander_style_get_type, pFv)
+GO(gtk_expander_style_get_type, LFv)
 GO(gtk_false, iFv)
-GO(gtk_file_chooser_action_get_type, pFv)
+GO(gtk_file_chooser_action_get_type, LFv)
 GO(gtk_file_chooser_add_filter, vFpp)
 GO(gtk_file_chooser_add_shortcut_folder, iFppp)
 GO(gtk_file_chooser_add_shortcut_folder_uri, iFppp)
 GO(gtk_file_chooser_button_get_focus_on_click, iFp)
 GO(gtk_file_chooser_button_get_title, pFp)
-GO(gtk_file_chooser_button_get_type, pFv)
+GO(gtk_file_chooser_button_get_type, LFv)
 GO(gtk_file_chooser_button_get_width_chars, iFp)
 GO(gtk_file_chooser_button_new, pFpu)
 GO(gtk_file_chooser_button_new_with_backend, pFpip)
@@ -1043,11 +1043,11 @@ GO(gtk_file_chooser_button_new_with_dialog, pFp)
 GO(gtk_file_chooser_button_set_focus_on_click, vFpi)
 GO(gtk_file_chooser_button_set_title, vFpp)
 GO(gtk_file_chooser_button_set_width_chars, vFpi)
-GO(gtk_file_chooser_confirmation_get_type, pFv)
-GO(gtk_file_chooser_dialog_get_type, pFv)
+GO(gtk_file_chooser_confirmation_get_type, LFv)
+GO(gtk_file_chooser_dialog_get_type, LFv)
 GO(gtk_file_chooser_dialog_new, pFppipipipipipipip)  // vaargs (so pFppipV) with additionnal buttons, end with a NULL
 GO(gtk_file_chooser_dialog_new_with_backend, pFppippipipipipipip)   // same but pFppippV
-GO(gtk_file_chooser_error_get_type, pFv)
+GO(gtk_file_chooser_error_get_type, LFv)
 GO(gtk_file_chooser_error_quark, pFv)
 GO(gtk_file_chooser_get_action, uFp)
 GO(gtk_file_chooser_get_create_folders, iFp)
@@ -1070,7 +1070,7 @@ GO(gtk_file_chooser_get_preview_widget, pFp)
 GO(gtk_file_chooser_get_preview_widget_active, iFp)
 GO(gtk_file_chooser_get_select_multiple, iFp)
 GO(gtk_file_chooser_get_show_hidden, iFp)
-GO(gtk_file_chooser_get_type, pFv)
+GO(gtk_file_chooser_get_type, LFv)
 GO(gtk_file_chooser_get_uri, pFp)
 GO(gtk_file_chooser_get_uris, pFp)
 GO(gtk_file_chooser_get_use_preview_label, iFp)
@@ -1106,7 +1106,7 @@ GO(gtk_file_chooser_unselect_all, vFp)
 GO(gtk_file_chooser_unselect_file, vFpp)
 GO(gtk_file_chooser_unselect_filename, vFpp)
 GO(gtk_file_chooser_unselect_uri, vFpp)
-GO(gtk_file_chooser_widget_get_type, pFv)
+GO(gtk_file_chooser_widget_get_type, LFv)
 GO(gtk_file_chooser_widget_new, pFu)
 GO(gtk_file_chooser_widget_new_with_backend, pFip)
 //GOM(gtk_file_filter_add_custom, vFEppppp)
@@ -1114,35 +1114,35 @@ GO(gtk_file_filter_add_mime_type, vFpp)
 GO(gtk_file_filter_add_pattern, vFpp)
 GO(gtk_file_filter_add_pixbuf_formats, vFp)
 GO(gtk_file_filter_filter, iFpp)
-GO(gtk_file_filter_flags_get_type, pFv)
+GO(gtk_file_filter_flags_get_type, LFv)
 GO(gtk_file_filter_get_name, pFp)
 GO(gtk_file_filter_get_needed, uFp)
-GO(gtk_file_filter_get_type, pFv)
+GO(gtk_file_filter_get_type, LFv)
 GO(gtk_file_filter_new, pFv)
 GO(gtk_file_filter_set_name, vFpp)
 GO(gtk_file_selection_complete, vFpp)
 GO(gtk_file_selection_get_filename, pFp)
 GO(gtk_file_selection_get_selections, pFp)
 GO(gtk_file_selection_get_select_multiple, iFp)
-GO(gtk_file_selection_get_type, pFv)
+GO(gtk_file_selection_get_type, LFv)
 GO(gtk_file_selection_hide_fileop_buttons, vFp)
 GO(gtk_file_selection_new, pFp)
 GO(gtk_file_selection_set_filename, vFpp)
 GO(gtk_file_selection_set_select_multiple, vFpi)
 GO(gtk_file_selection_show_fileop_buttons, vFp)
 GO(gtk_fixed_get_has_window, iFp)
-GO(gtk_fixed_get_type, pFv)
+GO(gtk_fixed_get_type, LFv)
 GO(gtk_fixed_move, vFppii)
 GO(gtk_fixed_new, pFv)
 GO(gtk_fixed_put, vFppii)
 GO(gtk_fixed_set_has_window, vFpi)
-GO(gtk_flow_box_child_get_type, pFv)
-GO(gtk_flow_box_get_type, pFv)
+GO(gtk_flow_box_child_get_type, LFv)
+GO(gtk_flow_box_get_type, LFv)
 GO(gtk_font_button_get_font_name, pFp)
 GO(gtk_font_button_get_show_size, iFp)
 GO(gtk_font_button_get_show_style, iFp)
 GO(gtk_font_button_get_title, pFp)
-GO(gtk_font_button_get_type, pFv)
+GO(gtk_font_button_get_type, LFv)
 GO(gtk_font_button_get_use_font, iFp)
 GO(gtk_font_button_get_use_size, iFp)
 GO(gtk_font_button_new, pFv)
@@ -1153,7 +1153,7 @@ GO(gtk_font_button_set_show_style, vFpi)
 GO(gtk_font_button_set_title, vFpp)
 GO(gtk_font_button_set_use_font, vFpi)
 GO(gtk_font_button_set_use_size, vFpi)
-GO(gtk_font_chooser_get_type, pFv)
+GO(gtk_font_chooser_get_type, LFv)
 GO(gtk_font_selection_dialog_get_apply_button, pFp)
 GO(gtk_font_selection_dialog_get_cancel_button, pFp)
 GO(gtk_font_selection_dialog_get_font, pFp)
@@ -1161,7 +1161,7 @@ GO(gtk_font_selection_dialog_get_font_name, pFp)
 GO(gtk_font_selection_dialog_get_font_selection, pFp)
 GO(gtk_font_selection_dialog_get_ok_button, pFp)
 GO(gtk_font_selection_dialog_get_preview_text, pFp)
-GO(gtk_font_selection_dialog_get_type, pFv)
+GO(gtk_font_selection_dialog_get_type, LFv)
 GO(gtk_font_selection_dialog_new, pFp)
 GO(gtk_font_selection_dialog_set_font_name, iFpp)
 GO(gtk_font_selection_dialog_set_preview_text, vFpp)
@@ -1176,7 +1176,7 @@ GO(gtk_font_selection_get_preview_text, pFp)
 GO(gtk_font_selection_get_size, iFp)
 GO(gtk_font_selection_get_size_entry, pFp)
 GO(gtk_font_selection_get_size_list, pFp)
-GO(gtk_font_selection_get_type, pFv)
+GO(gtk_font_selection_get_type, LFv)
 GO(gtk_font_selection_new, pFv)
 GO(gtk_font_selection_set_font_name, iFpp)
 GO(gtk_font_selection_set_preview_text, vFpp)
@@ -1184,13 +1184,13 @@ GO(gtk_frame_get_label, pFp)
 GO(gtk_frame_get_label_align, vFppp)
 GO(gtk_frame_get_label_widget, pFp)
 GO(gtk_frame_get_shadow_type, uFp)
-GO(gtk_frame_get_type, pFv)
+GO(gtk_frame_get_type, LFv)
 GO(gtk_frame_new, pFp)
 GO(gtk_frame_set_label, vFpp)
 GO(gtk_frame_set_label_align, vFpff)
 GO(gtk_frame_set_label_widget, vFpp)
 GO(gtk_frame_set_shadow_type, vFpu)
-GO(gtk_gamma_curve_get_type, pFv)
+GO(gtk_gamma_curve_get_type, LFv)
 GO(gtk_gamma_curve_new, pFv)
 GO(gtk_gc_get, pFippu)
 GO(gtk_gc_release, vFp)
@@ -1210,7 +1210,7 @@ GO(gtk_grab_add, vFp)
 GO(gtk_grab_get_current, pFv)
 GO(gtk_grab_remove, vFp)
 GO(gtk_grid_attach, vFppiiii)
-GO(gtk_grid_get_type, pFv)
+GO(gtk_grid_get_type, LFv)
 GO(gtk_grid_set_column_homogeneous, vFpi)
 GO(gtk_grid_set_column_spacing, vFpu)
 GO(gtk_grid_set_row_homogeneous, vFpi)
@@ -1219,16 +1219,16 @@ GO(gtk_handle_box_get_child_detached, iFp)
 GO(gtk_handle_box_get_handle_position, iFp)
 GO(gtk_handle_box_get_shadow_type, uFp)
 GO(gtk_handle_box_get_snap_edge, uFp)
-GO(gtk_handle_box_get_type, pFv)
+GO(gtk_handle_box_get_type, LFv)
 GO(gtk_handle_box_new, pFv)
 GO(gtk_handle_box_set_handle_position, vFpi)
 GO(gtk_handle_box_set_shadow_type, vFpu)
 GO(gtk_handle_box_set_snap_edge, vFpu)
-GO(gtk_hbox_get_type, pFv)
+GO(gtk_hbox_get_type, LFv)
 GO(gtk_hbox_new, pFii)
 GO(gtk_hbutton_box_get_layout_default, iFv)
 GO(gtk_hbutton_box_get_spacing_default, iFv)
-GO(gtk_hbutton_box_get_type, pFv)
+GO(gtk_hbutton_box_get_type, LFv)
 GO(gtk_hbutton_box_new, pFv)
 GO(gtk_hbutton_box_set_layout_default, vFi)
 GO(gtk_hbutton_box_set_spacing_default, vFi)
@@ -1237,20 +1237,20 @@ GO(gtk_header_bar_get_type, lFv)
 GO(gtk_header_bar_pack_end, vFpp)
 GO(gtk_header_bar_set_show_close_button, vFpi)
 GO(gtk_header_bar_set_title, vFpp)
-GO(gtk_hpaned_get_type, pFv)
+GO(gtk_hpaned_get_type, LFv)
 //GO(gtk_hpaned_new, 
-GO(gtk_hruler_get_type, pFv)
+GO(gtk_hruler_get_type, LFv)
 //GO(gtk_hruler_new, 
-GO(gtk_hscale_get_type, pFv)
+GO(gtk_hscale_get_type, LFv)
 GO(gtk_hscale_new, pFp)
 GO(gtk_hscale_new_with_range, pFddd)
-GO(gtk_hscrollbar_get_type, pFv)
+GO(gtk_hscrollbar_get_type, LFv)
 GO(gtk_hscrollbar_new, pFp)
-GO(gtk_hseparator_get_type, pFv)
+GO(gtk_hseparator_get_type, LFv)
 GO(gtk_hseparator_new, pFv)
 GO(gtk_hsv_get_color, vFpppp)
 GO(gtk_hsv_get_metrics, vFppp)
-GO(gtk_hsv_get_type, pFv)
+GO(gtk_hsv_get_type, LFv)
 GO(gtk_hsv_is_adjusting, iFp)
 //GO(gtk_hsv_new, 
 GO(gtk_hsv_set_color, vFpddd)
@@ -1258,7 +1258,7 @@ GO(gtk_hsv_set_metrics, vFpii)
 //GO(gtk_hsv_to_rgb, 
 GO(gtk_icon_factory_add, vFppp)
 GO(gtk_icon_factory_add_default, vFp)
-GO(gtk_icon_factory_get_type, pFv)
+GO(gtk_icon_factory_get_type, LFv)
 GO(gtk_icon_factory_lookup, pFpp)
 GO(gtk_icon_factory_lookup_default, pFp)
 GO(gtk_icon_factory_new, pFv)
@@ -1271,17 +1271,17 @@ GO(gtk_icon_info_get_builtin_pixbuf, pFp)
 GO(gtk_icon_info_get_display_name, pFp)
 GO(gtk_icon_info_get_embedded_rect, iFpp)
 GO(gtk_icon_info_get_filename, pFp)
-GO(gtk_icon_info_get_type, pFv)
+GO(gtk_icon_info_get_type, LFv)
 GO(gtk_icon_info_load_icon, pFpp)
 GO(gtk_icon_info_load_surface, pFppp)
 GO(gtk_icon_info_load_symbolic_for_context, pFpppp)
 GO(gtk_icon_info_new_for_pixbuf, pFpp)
 GO(gtk_icon_info_set_raw_coordinates, vFpi)
-GO(gtk_icon_lookup_flags_get_type, pFv)
+GO(gtk_icon_lookup_flags_get_type, LFv)
 GO(gtk_icon_set_add_source, vFpp)
 GO(gtk_icon_set_copy, pFp)
 GO(gtk_icon_set_get_sizes, vFppp)
-GO(gtk_icon_set_get_type, pFv)
+GO(gtk_icon_set_get_type, LFv)
 GO(gtk_icon_set_new, pFv)
 GO(gtk_icon_set_new_from_pixbuf, pFp)
 GO(gtk_icon_set_ref, pFp)
@@ -1289,7 +1289,7 @@ GO(gtk_icon_set_render_icon, pFppuuupp)
 GO(gtk_icon_set_unref, vFp)
 GO(gtk_icon_size_from_name, uFp)
 GO(gtk_icon_size_get_name, pFu)
-GO(gtk_icon_size_get_type, pFv)
+GO(gtk_icon_size_get_type, LFv)
 GO(gtk_icon_size_lookup, iFupp)
 GO(gtk_icon_size_lookup_for_settings, iFpupp)
 GO(gtk_icon_size_register, uFpii)
@@ -1305,7 +1305,7 @@ GO(gtk_icon_source_get_size, uFp)
 GO(gtk_icon_source_get_size_wildcarded, iFp)
 GO(gtk_icon_source_get_state, uFp)
 GO(gtk_icon_source_get_state_wildcarded, iFp)
-GO(gtk_icon_source_get_type, pFv)
+GO(gtk_icon_source_get_type, LFv)
 GO(gtk_icon_source_new, pFv)
 GO(gtk_icon_source_set_direction, vFpu)
 GO(gtk_icon_source_set_direction_wildcarded, vFpi)
@@ -1319,7 +1319,7 @@ GO(gtk_icon_source_set_state_wildcarded, vFpi)
 GO(gtk_icon_theme_add_builtin_icon, vFpip)
 GO(gtk_icon_theme_append_search_path, vFpp)
 GO(gtk_icon_theme_choose_icon, pFppiu)
-GO(gtk_icon_theme_error_get_type, pFv)
+GO(gtk_icon_theme_error_get_type, LFv)
 //GO(gtk_icon_theme_error_quark, 
 GO(gtk_icon_theme_get_default, pFv)
 GO(gtk_icon_theme_get_example_icon_name, pFp)
@@ -1327,7 +1327,7 @@ GO(gtk_icon_theme_get_for_display, pFp)
 GO(gtk_icon_theme_get_for_screen, pFp)
 GO(gtk_icon_theme_get_icon_sizes, pFpp)
 GO(gtk_icon_theme_get_search_path, vFppp)
-GO(gtk_icon_theme_get_type, pFv)
+GO(gtk_icon_theme_get_type, LFv)
 GO(gtk_icon_theme_has_icon, iFpp)
 GO(gtk_icon_theme_list_contexts, pFp)
 GO(gtk_icon_theme_list_icons, pFpp)
@@ -1343,7 +1343,7 @@ GO(gtk_icon_theme_set_screen, vFpp)
 GO(gtk_icon_theme_set_search_path, vFppi)
 GO(gtk_icon_view_convert_widget_to_bin_window_coords, vFpiipp)
 GO(gtk_icon_view_create_drag_icon, pFpp)
-GO(gtk_icon_view_drop_position_get_type, pFv)
+GO(gtk_icon_view_drop_position_get_type, LFv)
 GO(gtk_icon_view_enable_model_drag_dest, vFppiu)
 GO(gtk_icon_view_enable_model_drag_source, vFpupiu)
 GO(gtk_icon_view_get_columns, iFp)
@@ -1371,7 +1371,7 @@ GO(gtk_icon_view_get_spacing, iFp)
 GO(gtk_icon_view_get_text_column, iFp)
 GO(gtk_icon_view_get_tooltip_column, iFp)
 GO(gtk_icon_view_get_tooltip_context, iFpppippp)
-GO(gtk_icon_view_get_type, pFv)
+GO(gtk_icon_view_get_type, LFv)
 GO(gtk_icon_view_get_visible_range, iFppp)
 GO(gtk_icon_view_item_activated, vFpp)
 GO(gtk_icon_view_new, pFv)
@@ -1405,7 +1405,7 @@ GO(gtk_icon_view_unselect_all, vFp)
 GO(gtk_icon_view_unselect_path, vFpp)
 GO(gtk_icon_view_unset_model_drag_dest, vFp)
 GO(gtk_icon_view_unset_model_drag_source, vFp)
-GO(gtk_identifier_get_type, pFv)
+GO(gtk_identifier_get_type, LFv)
 //GOM(gtk_idle_add, uFEBp)
 //GOM(gtk_idle_add_full, uFEiBppB)
 //GOM(gtk_idle_add_priority, uFEiBp)
@@ -1423,10 +1423,10 @@ GO(gtk_image_get_pixel_size, iFp)
 GO(gtk_image_get_pixmap, vFppp)
 GO(gtk_image_get_stock, vFppp)
 GO(gtk_image_get_storage_type, uFp)
-GO(gtk_image_get_type, pFv)
+GO(gtk_image_get_type, LFv)
 GO(gtk_image_menu_item_get_always_show_image, iFp)
 GO(gtk_image_menu_item_get_image, pFp)
-GO(gtk_image_menu_item_get_type, pFv)
+GO(gtk_image_menu_item_get_type, LFv)
 GO(gtk_image_menu_item_get_use_stock, iFp)
 GO(gtk_image_menu_item_new, pFv)
 GO(gtk_image_menu_item_new_from_stock, pFpp)
@@ -1457,7 +1457,7 @@ GO(gtk_image_set_from_pixbuf, vFpp)
 GO(gtk_image_set_from_pixmap, vFppp)
 GO(gtk_image_set_from_stock, vFppi)
 GO(gtk_image_set_pixel_size, vFpi)
-GO(gtk_image_type_get_type, pFv)
+GO(gtk_image_type_get_type, LFv)
 GO(gtk_im_context_delete_surrounding, iFpii)
 GO(gtk_im_context_filter_key, iFpippuuii)
 GO(gtk_im_context_filter_keypress, iFpp)
@@ -1465,7 +1465,7 @@ GO(gtk_im_context_focus_in, vFp)
 GO(gtk_im_context_focus_out, vFp)
 GO(gtk_im_context_get_preedit_string, vFpppp)
 GO(gtk_im_context_get_surrounding, iFppp)
-GO(gtk_im_context_get_type, pFv)
+GO(gtk_im_context_get_type, LFv)
 GO(gtk_im_context_reset, vFp)
 GO(gtk_im_context_set_client_widget, vFpp)
 GO(gtk_im_context_set_client_window, vFpp)
@@ -1473,22 +1473,22 @@ GO(gtk_im_context_set_cursor_location, vFpp)
 GO(gtk_im_context_set_surrounding, vFppii)
 GO(gtk_im_context_set_use_preedit, vFpi)
 GO(gtk_im_context_simple_add_table, vFppii)
-GO(gtk_im_context_simple_get_type, pFv)
+GO(gtk_im_context_simple_get_type, LFv)
 GO(gtk_im_context_simple_new, pFv)
 GO(gtk_im_multicontext_append_menuitems, vFpp)
 GO(gtk_im_multicontext_get_context_id, pFp)
-GO(gtk_im_multicontext_get_type, pFv)
+GO(gtk_im_multicontext_get_type, LFv)
 GO(gtk_im_multicontext_new, pFv)
 GO(gtk_im_multicontext_set_context_id, vFpp)
-GO(gtk_im_preedit_style_get_type, pFv)
-GO(gtk_im_status_style_get_type, pFv)
+GO(gtk_im_preedit_style_get_type, LFv)
+GO(gtk_im_status_style_get_type, LFv)
 GO(gtk_info_bar_add_action_widget, vFppi)
 GO(gtk_info_bar_add_button, pFppi)
 //GO(gtk_info_bar_add_buttons, 
 //GO(gtk_info_bar_get_action_area, 
 GO(gtk_info_bar_get_content_area, pFp)
 GO(gtk_info_bar_get_message_type, uFp)
-GO(gtk_info_bar_get_type, pFv)
+GO(gtk_info_bar_get_type, LFv)
 //GO(gtk_info_bar_new, 
 //GO(gtk_info_bar_new_with_buttons, 
 GO(gtk_info_bar_response, vFpi)
@@ -1500,13 +1500,13 @@ GOM(gtk_init, vFEpp)
 GOM(gtk_init_check, iFEpp)
 GOM(gtk_init_with_args, iFEpppppp)
 //GOM(gtk_input_add_full, uFEiBBppB)
-GO(gtk_input_dialog_get_type, pFv)
+GO(gtk_input_dialog_get_type, LFv)
 GO(gtk_input_dialog_new, pFv)
-GO(gtk_input_hints_get_type, pFv)
-GO(gtk_input_purpose_get_type, pFv)
+GO(gtk_input_hints_get_type, LFv)
+GO(gtk_input_purpose_get_type, LFv)
 GO(gtk_input_remove, vFu)
 GO(gtk_invisible_get_screen, pFp)
-GO(gtk_invisible_get_type, pFv)
+GO(gtk_invisible_get_type, LFv)
 //GO(gtk_invisible_new, 
 GO(gtk_invisible_new_for_screen, pFp)
 GO(gtk_invisible_set_screen, vFpp)
@@ -1525,7 +1525,7 @@ GO(gtk_invisible_set_screen, vFpp)
 //GO(gtk_item_factory_from_widget, 
 //GO(gtk_item_factory_get_item, 
 //GO(gtk_item_factory_get_item_by_action, 
-GO(gtk_item_factory_get_type, pFv)
+GO(gtk_item_factory_get_type, LFv)
 //GO(gtk_item_factory_get_widget, 
 //GO(gtk_item_factory_get_widget_by_action, 
 //GO(gtk_item_factory_new, 
@@ -1535,10 +1535,10 @@ GO(gtk_item_factory_get_type, pFv)
 //GO(gtk_item_factory_popup_data_from_widget, 
 //GO(gtk_item_factory_popup_with_data, 
 //GO(gtk_item_factory_set_translate_func, 
-GO(gtk_item_get_type, pFv)
+GO(gtk_item_get_type, LFv)
 //GO(gtk_item_select, 
 //GO(gtk_item_toggle, 
-GO(gtk_justification_get_type, pFv)
+GO(gtk_justification_get_type, LFv)
 //GOM(gtk_key_snooper_install, uFEBp)
 GO(gtk_key_snooper_remove, vFu)
 GO(gtk_label_get, vFpp)
@@ -1560,7 +1560,7 @@ GO(gtk_label_get_selection_bounds, iFppp)
 GO(gtk_label_get_single_line_mode, iFp)
 GO(gtk_label_get_text, pFp)
 GO(gtk_label_get_track_visited_links, iFp)
-GO(gtk_label_get_type, pFv)
+GO(gtk_label_get_type, LFv)
 GO(gtk_label_get_use_markup, iFp)
 GO(gtk_label_get_use_underline, iFp)
 GO(gtk_label_get_width_chars, iFp)
@@ -1592,7 +1592,7 @@ GO(gtk_label_set_width_chars, vFpi)
 GO(gtk_layout_get_bin_window, pFp)
 //GO(gtk_layout_get_hadjustment, 
 GO(gtk_layout_get_size, vFppp)
-GO(gtk_layout_get_type, pFv)
+GO(gtk_layout_get_type, LFv)
 GO(gtk_layout_get_vadjustment, pFp)
 GO(gtk_layout_move, vFppii)
 GO(gtk_layout_new, pFpp)
@@ -1601,10 +1601,10 @@ GO(gtk_layout_new, pFpp)
 GO(gtk_layout_set_size, vFpuu)
 GO(gtk_layout_set_vadjustment, vFpp)
 //GO(gtk_layout_thaw, 
-GO(gtk_level_bar_mode_get_type, pFv)
-GO(gtk_level_bar_get_type, pFv)
-GO(gtk_license_get_type, pFv)
-GO(gtk_link_button_get_type, pFv)
+GO(gtk_level_bar_mode_get_type, LFv)
+GO(gtk_level_bar_get_type, LFv)
+GO(gtk_license_get_type, LFv)
+GO(gtk_link_button_get_type, LFv)
 GO(gtk_link_button_get_uri, pFp)
 GO(gtk_link_button_get_visited, iFp)
 //GO(gtk_link_button_new, 
@@ -1613,18 +1613,18 @@ GO(gtk_link_button_set_uri, vFpp)
 //GO(gtk_link_button_set_uri_hook, 
 GO(gtk_link_button_set_visited, vFpi)
 GO(gtk_list_append_items, vFpp)
-GO(gtk_list_box_get_type, pFv)
-GO(gtk_list_box_row_get_type, pFv)
+GO(gtk_list_box_get_type, LFv)
+GO(gtk_list_box_row_get_type, LFv)
 GO(gtk_list_box_set_header_func, vFppp)
 GO(gtk_list_child_position, iFpp)
 GO(gtk_list_clear_items, vFpii)
 GO(gtk_list_end_drag_selection, vFp)
 GO(gtk_list_end_selection, vFp)
 GO(gtk_list_extend_selection, vFpifi)
-GO(gtk_list_get_type, pFv)
+GO(gtk_list_get_type, LFv)
 GO(gtk_list_insert_items, vFppi)
 GO(gtk_list_item_deselect, vFp)
-GO(gtk_list_item_get_type, pFv)
+GO(gtk_list_item_get_type, LFv)
 GO(gtk_list_item_new, pFv)
 GO(gtk_list_item_new_with_label, pFp)
 GO(gtk_list_item_select, vFp)
@@ -1641,7 +1641,7 @@ GO(gtk_list_set_selection_mode, vFpi)
 GO(gtk_list_start_selection, vFp)
 GO(gtk_list_store_append, vFpp)
 GO(gtk_list_store_clear, vFp)
-GO(gtk_list_store_get_type, pFv)
+GO(gtk_list_store_get_type, LFv)
 GO(gtk_list_store_insert, vFppi)
 GO(gtk_list_store_insert_after, vFppp)
 GO(gtk_list_store_insert_before, vFppp)
@@ -1700,20 +1700,20 @@ GO(gtk_main_quit, vFv)
 //GO(gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER, 
 //GO(gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM, 
 //GO(gtk_marshal_VOID__UINT_STRING, 
-GO(gtk_match_type_get_type, pFv)
+GO(gtk_match_type_get_type, LFv)
 GO(gtk_menu_attach, vFppuuuu)
 GOM(gtk_menu_attach_to_widget, vFEppp)
 GO(gtk_menu_bar_get_child_pack_direction, uFp)
 GO(gtk_menu_bar_get_pack_direction, iFp)
-GO(gtk_menu_bar_get_type, pFv)
+GO(gtk_menu_bar_get_type, LFv)
 GO(gtk_menu_bar_new, pFv)
 GO(gtk_menu_bar_set_child_pack_direction, vFpu)
 GO(gtk_menu_bar_set_pack_direction, vFpi)
 GO(gtk_menu_button_new, pFv)
 GO(gtk_menu_button_set_menu_model, vFpp)
-GO(gtk_menu_button_get_type, pFv)
+GO(gtk_menu_button_get_type, LFv)
 GO(gtk_menu_detach, vFp)
-GO(gtk_menu_direction_type_get_type, pFv)
+GO(gtk_menu_direction_type_get_type, LFv)
 GO(gtk_menu_get_accel_group, pFp)
 GO(gtk_menu_get_accel_path, pFp)
 GO(gtk_menu_get_active, pFp)
@@ -1723,14 +1723,14 @@ GO(gtk_menu_get_monitor, iFp)
 GO(gtk_menu_get_reserve_toggle_size, iFp)
 GO(gtk_menu_get_tearoff_state, iFp)
 GO(gtk_menu_get_title, pFp)
-GO(gtk_menu_get_type, pFv)
+GO(gtk_menu_get_type, LFv)
 GO(gtk_menu_item_activate, vFp)
 GO(gtk_menu_item_deselect, vFp)
 GO(gtk_menu_item_get_accel_path, pFp)
 GO(gtk_menu_item_get_label, pFp)
 GO(gtk_menu_item_get_right_justified, iFp)
 GO(gtk_menu_item_get_submenu, pFp)
-GO(gtk_menu_item_get_type, pFv)
+GO(gtk_menu_item_get_type, LFv)
 GO(gtk_menu_item_get_use_underline, vFpi)
 GO(gtk_menu_item_new, pFv)
 GO(gtk_menu_item_new_with_label, pFp)
@@ -1763,14 +1763,14 @@ GO(gtk_menu_shell_append, vFpp)
 //GO(gtk_menu_shell_deactivate, 
 //GO(gtk_menu_shell_deselect, 
 GO(gtk_menu_shell_get_take_focus, iFp)
-GO(gtk_menu_shell_get_type, pFv)
+GO(gtk_menu_shell_get_type, LFv)
 GO(gtk_menu_shell_insert, vFppi)
 GO(gtk_menu_shell_prepend, vFpp)
 GO(gtk_menu_shell_select_first, vFpi)
 GO(gtk_menu_shell_select_item, vFpp)
 GO(gtk_menu_shell_set_take_focus, vFpi)
 GO(gtk_menu_tool_button_get_menu, pFp)
-GO(gtk_menu_tool_button_get_type, pFv)
+GO(gtk_menu_tool_button_get_type, LFv)
 GO(gtk_menu_tool_button_new, pFpp)
 //GO(gtk_menu_tool_button_new_from_stock, 
 //GO(gtk_menu_tool_button_set_arrow_tooltip, 
@@ -1781,26 +1781,26 @@ GOM(gtk_message_dialog_format_secondary_markup, vFEppV)
 GOM(gtk_message_dialog_format_secondary_text, vFEppV)
 GO(gtk_message_dialog_get_image, pFp)
 GO(gtk_message_dialog_get_message_area, pFp)
-GO(gtk_message_dialog_get_type, pFv)
+GO(gtk_message_dialog_get_type, LFv)
 GO(gtk_message_dialog_new, pFpuiippppppppppp)   // vaarg :(
 GO(gtk_message_dialog_new_with_markup, pFpuiippppppppppp)   // vaarg
 GO(gtk_message_dialog_set_image, vFpp)
 GO(gtk_message_dialog_set_markup, vFpp)
-GO(gtk_message_type_get_type, pFv)
-GO(gtk_metric_type_get_type, pFv)
+GO(gtk_message_type_get_type, LFv)
+GO(gtk_metric_type_get_type, LFv)
 GO(gtk_misc_get_alignment, vFppp)
 GO(gtk_misc_get_padding, vFppp)
-GO(gtk_misc_get_type, pFv)
+GO(gtk_misc_get_type, LFv)
 GO(gtk_misc_set_alignment, vFpff)
 GO(gtk_misc_set_padding, vFpii)
 GO(gtk_mount_operation_get_parent, pFp)
 GO(gtk_mount_operation_get_screen, pFp)
-GO(gtk_mount_operation_get_type, pFv)
+GO(gtk_mount_operation_get_type, LFv)
 GO(gtk_mount_operation_is_showing, iFp)
 GO(gtk_mount_operation_new, pFp)
 GO(gtk_mount_operation_set_parent, vFpp)
 GO(gtk_mount_operation_set_screen, vFpp)
-GO(gtk_movement_step_get_type, pFv)
+GO(gtk_movement_step_get_type, LFv)
 GO(gtk_native_get_surface, pFp)
 GO(gtk_notebook_append_page, iFppp)
 GO(gtk_notebook_append_page_menu, iFpppp)
@@ -1823,7 +1823,7 @@ GO(gtk_notebook_get_tab_label_text, pFpp)
 GO(gtk_notebook_get_tab_pos, uFp)
 GO(gtk_notebook_get_tab_reorderable, iFpp)
 GO(gtk_notebook_get_tab_vborder, WFp)
-GO(gtk_notebook_get_type, pFv)
+GO(gtk_notebook_get_type, LFv)
 GO(gtk_notebook_insert_page, iFpppi)
 GO(gtk_notebook_insert_page_menu, iFppppi)
 GO(gtk_notebook_new, pFv)
@@ -1858,15 +1858,15 @@ GO(gtk_notebook_set_tab_pos, vFpu)
 GO(gtk_notebook_set_tab_reorderable, vFppi)
 GO(gtk_notebook_set_tab_vborder, vFpu)
 //GOM(gtk_notebook_set_window_creation_hook, pFEppp)
-GO(gtk_notebook_tab_get_type, pFv)
-GO(gtk_number_up_layout_get_type, pFv)
+GO(gtk_notebook_tab_get_type, LFv)
+GO(gtk_number_up_layout_get_type, LFv)
 GO(gtk_object_add_arg_type, vFpiuu)
 GO(gtk_object_destroy, vFp)
-GO(gtk_object_flags_get_type, pFv)
+GO(gtk_object_flags_get_type, LFv)
 GO(gtk_object_get, vFppppppppppp)   // vaarg
 GO(gtk_object_get_data, pFpp)
 GO(gtk_object_get_data_by_id, pFpp)
-GO(gtk_object_get_type, pFv)
+GO(gtk_object_get_type, LFv)
 GO(gtk_object_get_user_data, pFp)
 GO(gtk_object_new, pFppppppppppp)   //vaarg
 GO(gtk_object_ref, pFp)
@@ -1886,28 +1886,28 @@ GO(gtk_object_unref, vFp)
 //GOM(gtk_object_weakunref, vFEppp)
 GO(gtk_offscreen_window_get_pixbuf, pFp)
 GO(gtk_offscreen_window_get_pixmap, pFp)
-GO(gtk_offscreen_window_get_type, pFv)
+GO(gtk_offscreen_window_get_type, LFv)
 GO(gtk_offscreen_window_new, pFv)
 GO(gtk_old_editable_changed, vFp)
 GO(gtk_old_editable_claim_selection, vFpiu)
-GO(gtk_old_editable_get_type, pFv)
+GO(gtk_old_editable_get_type, LFv)
 GO(gtk_option_menu_get_history, iFp)
 GO(gtk_option_menu_get_menu, pFp)
-GO(gtk_option_menu_get_type, pFv)
+GO(gtk_option_menu_get_type, LFv)
 GO(gtk_option_menu_new, pFv)
 GO(gtk_option_menu_remove_menu, vFp)
 GO(gtk_option_menu_set_history, vFpu)
 GO(gtk_option_menu_set_menu, vFpp)
 GO(gtk_orientable_get_orientation, uFp)
-GO(gtk_orientable_get_type, pFv)
+GO(gtk_orientable_get_type, LFv)
 GO(gtk_orientable_set_orientation, vFpu)
-GO(gtk_orientation_get_type, pFv)
+GO(gtk_orientation_get_type, LFv)
 GO(gtk_overlay_add_overlay, vFpp)
-GO(gtk_overlay_get_type, pFv)
-GO(gtk_pack_direction_get_type, pFv)
-GO(gtk_pack_type_get_type, pFv)
-GO(gtk_page_orientation_get_type, pFv)
-GO(gtk_page_set_get_type, pFv)
+GO(gtk_overlay_get_type, LFv)
+GO(gtk_pack_direction_get_type, LFv)
+GO(gtk_pack_type_get_type, LFv)
+GO(gtk_page_orientation_get_type, LFv)
+GO(gtk_page_set_get_type, LFv)
 GO(gtk_page_setup_copy, pFp)
 //GO(gtk_page_setup_get_bottom_margin, 
 GO(gtk_page_setup_get_left_margin, dFpi)
@@ -1919,7 +1919,7 @@ GO(gtk_page_setup_get_paper_size, pFp)
 GO(gtk_page_setup_get_paper_width, dFpi)
 GO(gtk_page_setup_get_right_margin, dFpi)
 GO(gtk_page_setup_get_top_margin, dFpi)
-GO(gtk_page_setup_get_type, pFv)
+GO(gtk_page_setup_get_type, LFv)
 //GO(gtk_page_setup_load_file, 
 GO(gtk_page_setup_load_key_file, iFpppp)
 GO(gtk_page_setup_new, pFv)
@@ -1936,7 +1936,7 @@ GO(gtk_page_setup_to_file, iFppp)
 GO(gtk_page_setup_to_key_file, vFppp)
 //GO(gtk_page_setup_unix_dialog_get_page_setup, 
 //GO(gtk_page_setup_unix_dialog_get_print_settings, 
-GO(gtk_page_setup_unix_dialog_get_type, pFv)
+GO(gtk_page_setup_unix_dialog_get_type, LFv)
 //GO(gtk_page_setup_unix_dialog_new, 
 //GO(gtk_page_setup_unix_dialog_set_page_setup, 
 //GO(gtk_page_setup_unix_dialog_set_print_settings, 
@@ -1969,7 +1969,7 @@ GO(gtk_paned_get_child1, pFp)
 GO(gtk_paned_get_child2, pFp)
 GO(gtk_paned_get_handle_window, pFp)
 GO(gtk_paned_get_position, iFp)
-GO(gtk_paned_get_type, pFv)
+GO(gtk_paned_get_type, LFv)
 GO(gtk_paned_pack1, vFppii)
 GO(gtk_paned_pack2, vFppii)
 GO(gtk_paned_set_position, vFpi)
@@ -1985,7 +1985,7 @@ GO(gtk_paper_size_get_height, dFpi)
 GO(gtk_paper_size_get_name, pFp)
 GO(gtk_paper_size_get_paper_sizes, pFi)
 GO(gtk_paper_size_get_ppd_name, pFp)
-GO(gtk_paper_size_get_type, pFv)
+GO(gtk_paper_size_get_type, LFv)
 GO(gtk_paper_size_get_width, dFpi)
 GO(gtk_paper_size_is_custom, iFp)
 GO(gtk_paper_size_is_equal, iFpp)
@@ -1996,11 +1996,11 @@ GO(gtk_paper_size_new_from_ppd, pFppdd)
 GO(gtk_paper_size_set_size, vFpddu)
 GO(gtk_paper_size_to_key_file, vFppp)
 GO(gtk_parse_args, iFpp)
-GO(gtk_path_bar_get_type, pFv)
-GO(gtk_path_priority_type_get_type, pFv)
-GO(gtk_path_type_get_type, pFv)
+GO(gtk_path_bar_get_type, LFv)
+GO(gtk_path_priority_type_get_type, LFv)
+GO(gtk_path_type_get_type, LFv)
 GO(gtk_pixmap_get, vFppp)
-GO(gtk_pixmap_get_type, pFv)
+GO(gtk_pixmap_get_type, LFv)
 GO(gtk_pixmap_new, pFpp)
 GO(gtk_pixmap_set, vFppp)
 GO(gtk_pixmap_set_build_insensitive, vFpi)
@@ -2009,16 +2009,16 @@ GO(gtk_plug_construct_for_display, vFppp)
 GO(gtk_plug_get_embedded, iFp)
 GO(gtk_plug_get_id, pFp)
 GO(gtk_plug_get_socket_window, pFp)
-GO(gtk_plug_get_type, pFv)
+GO(gtk_plug_get_type, LFv)
 GO(gtk_plug_new, pFp)
 GO(gtk_plug_new_for_display, pFpp)
-GO(gtk_policy_type_get_type, pFv)
-GO(gtk_popover_get_type, pFv)
-GO(gtk_position_type_get_type, pFv)
+GO(gtk_policy_type_get_type, LFv)
+GO(gtk_popover_get_type, LFv)
+GO(gtk_position_type_get_type, LFv)
 //GO(gtk_preview_draw_row, 
 //GO(gtk_preview_get_cmap, 
 //GO(gtk_preview_get_info, 
-GO(gtk_preview_get_type, pFv)
+GO(gtk_preview_get_type, LFv)
 //GO(gtk_preview_get_visual, 
 //GO(gtk_preview_new, 
 //GO(gtk_preview_put, 
@@ -2030,21 +2030,21 @@ GO(gtk_preview_get_type, pFv)
 //GO(gtk_preview_set_install_cmap, 
 //GO(gtk_preview_set_reserved, 
 //GO(gtk_preview_size, 
-GO(gtk_preview_type_get_type, pFv)
+GO(gtk_preview_type_get_type, LFv)
 //GO(gtk_preview_uninit, 
 //GO(gtk_print_backend_add_printer, 
 //GO(gtk_print_backend_destroy, 
 //GO(gtk_print_backend_error_quark, 
 //GO(gtk_print_backend_find_printer, 
 //GO(gtk_print_backend_get_printer_list, 
-GO(gtk_print_backend_get_type, pFv)
+GO(gtk_print_backend_get_type, LFv)
 //GO(gtk_print_backend_load_modules, 
 //GO(gtk_print_backend_printer_list_is_done, 
 //GO(gtk_print_backend_print_stream, 
 //GO(gtk_print_backend_remove_printer, 
 //GO(gtk_print_backend_set_list_done, 
 //GO(gtk_print_backend_set_password, 
-GO(gtk_print_capabilities_get_type, pFv)
+GO(gtk_print_capabilities_get_type, LFv)
 GO(gtk_print_context_create_pango_context, pFp)
 GO(gtk_print_context_create_pango_layout, pFp)
 GO(gtk_print_context_get_cairo_context, pFp)
@@ -2054,10 +2054,10 @@ GO(gtk_print_context_get_hard_margins, iFppppp)
 //GO(gtk_print_context_get_height, 
 GO(gtk_print_context_get_page_setup, pFp)
 GO(gtk_print_context_get_pango_fontmap, pFp)
-GO(gtk_print_context_get_type, pFv)
+GO(gtk_print_context_get_type, LFv)
 //GO(gtk_print_context_get_width, 
 GO(gtk_print_context_set_cairo_context, vFppdd)
-GO(gtk_print_duplex_get_type, pFv)
+GO(gtk_print_duplex_get_type, LFv)
 //GO(gtk_printer_accepts_pdf, 
 //GO(gtk_printer_accepts_ps, 
 //GO(gtk_printer_compare, 
@@ -2071,7 +2071,7 @@ GO(gtk_printer_get_default_page_size, pFp)
 //GO(gtk_printer_get_location, 
 GO(gtk_printer_get_name, pFp)
 //GO(gtk_printer_get_state_message, 
-GO(gtk_printer_get_type, pFv)
+GO(gtk_printer_get_type, LFv)
 //GO(gtk_printer_has_details, 
 //GO(gtk_printer_is_accepting_jobs, 
 //GO(gtk_printer_is_active, 
@@ -2085,7 +2085,7 @@ GO(gtk_printer_is_default, iFp)
 //GO(gtk_printer_option_choices_from_array, 
 //GO(gtk_printer_option_clear_has_conflict, 
 //GO(gtk_printer_option_get_activates_default, 
-GO(gtk_printer_option_get_type, pFv)
+GO(gtk_printer_option_get_type, LFv)
 //GO(gtk_printer_option_has_choice, 
 //GO(gtk_printer_option_new, 
 //GO(gtk_printer_option_set, 
@@ -2096,19 +2096,19 @@ GO(gtk_printer_option_get_type, pFv)
 //GO(gtk_printer_option_set_foreach, 
 //GO(gtk_printer_option_set_foreach_in_group, 
 //GO(gtk_printer_option_set_get_groups, 
-GO(gtk_printer_option_set_get_type, pFv)
+GO(gtk_printer_option_set_get_type, LFv)
 //GO(gtk_printer_option_set_has_conflict, 
 //GO(gtk_printer_option_set_lookup, 
 //GO(gtk_printer_option_set_new, 
 //GO(gtk_printer_option_set_remove, 
 //GO(gtk_printer_option_widget_get_external_label, 
-GO(gtk_printer_option_widget_get_type, pFv)
+GO(gtk_printer_option_widget_get_type, LFv)
 //GO(gtk_printer_option_widget_get_value, 
 //GO(gtk_printer_option_widget_has_external_label, 
 //GO(gtk_printer_option_widget_new, 
 //GO(gtk_printer_option_widget_set_source, 
 //GO(gtk_printer_request_details, 
-GO(gtk_print_error_get_type, pFv)
+GO(gtk_print_error_get_type, LFv)
 //GO(gtk_print_error_quark, 
 //GO(gtk_printer_set_accepts_pdf, 
 //GO(gtk_printer_set_accepts_ps, 
@@ -2129,13 +2129,13 @@ GO(gtk_print_error_get_type, pFv)
 //GO(gtk_print_job_get_surface, 
 //GO(gtk_print_job_get_title, 
 //GO(gtk_print_job_get_track_print_status, 
-GO(gtk_print_job_get_type, pFv)
+GO(gtk_print_job_get_type, LFv)
 GO(gtk_print_job_new, pFpppp)
 GOM(gtk_print_job_send, vFEpppp)
 GO(gtk_print_job_set_source_file, iFppp)
 //GO(gtk_print_job_set_status, 
 //GO(gtk_print_job_set_track_print_status, 
-GO(gtk_print_operation_action_get_type, pFv)
+GO(gtk_print_operation_action_get_type, LFv)
 //GO(gtk_print_operation_cancel, 
 //GO(gtk_print_operation_draw_page_finish, 
 GO(gtk_print_operation_get_default_page_setup, pFp)
@@ -2147,14 +2147,14 @@ GO(gtk_print_operation_get_print_settings, pFp)
 GO(gtk_print_operation_get_status, uFp)
 GO(gtk_print_operation_get_status_string, pFp)
 //GO(gtk_print_operation_get_support_selection, 
-GO(gtk_print_operation_get_type, pFv)
+GO(gtk_print_operation_get_type, LFv)
 //GO(gtk_print_operation_is_finished, 
 GO(gtk_print_operation_new, pFv)
 //GO(gtk_print_operation_preview_end_preview, 
-GO(gtk_print_operation_preview_get_type, pFv)
+GO(gtk_print_operation_preview_get_type, LFv)
 GO(gtk_print_operation_preview_is_selected, iFpi)
 GO(gtk_print_operation_preview_render_page, vFpi)
-GO(gtk_print_operation_result_get_type, pFv)
+GO(gtk_print_operation_result_get_type, LFv)
 GO(gtk_print_operation_run, uFpupp)
 //GO(gtk_print_operation_set_allow_async, 
 GO(gtk_print_operation_set_current_page, vFpi)
@@ -2172,8 +2172,8 @@ GO(gtk_print_operation_set_print_settings, vFpp)
 //GO(gtk_print_operation_set_track_print_status, 
 GO(gtk_print_operation_set_unit, vFpu)
 //GO(gtk_print_operation_set_use_full_page, 
-GO(gtk_print_pages_get_type, pFv)
-GO(gtk_print_quality_get_type, pFv)
+GO(gtk_print_pages_get_type, LFv)
+GO(gtk_print_quality_get_type, LFv)
 GO(gtk_print_run_page_setup_dialog, pFppp)
 //GO(gtk_print_run_page_setup_dialog_async, 
 GO(gtk_print_settings_copy, pFp)
@@ -2210,7 +2210,7 @@ GO(gtk_print_settings_get_resolution, iFp)
 GO(gtk_print_settings_get_resolution_y, iFp)
 GO(gtk_print_settings_get_reverse, iFp)
 GO(gtk_print_settings_get_scale, dFp)
-GO(gtk_print_settings_get_type, pFv)
+GO(gtk_print_settings_get_type, LFv)
 //GO(gtk_print_settings_get_use_color, 
 //GO(gtk_print_settings_has_key, 
 //GO(gtk_print_settings_load_file, 
@@ -2251,7 +2251,7 @@ GO(gtk_print_settings_set_scale, vFpd)
 GO(gtk_print_settings_to_file, iFppp)
 GO(gtk_print_settings_to_key_file, vFppp)
 //GO(gtk_print_settings_unset, 
-GO(gtk_print_status_get_type, pFv)
+GO(gtk_print_status_get_type, LFv)
 //GO(gtk_print_unix_dialog_add_custom_tab, 
 //GO(gtk_print_unix_dialog_get_current_page, 
 //GO(gtk_print_unix_dialog_get_embed_page_setup, 
@@ -2262,7 +2262,7 @@ GO(gtk_print_unix_dialog_get_page_setup, pFp)
 GO(gtk_print_unix_dialog_get_selected_printer, pFp)
 GO(gtk_print_unix_dialog_get_settings, pFp)
 //GO(gtk_print_unix_dialog_get_support_selection, 
-GO(gtk_print_unix_dialog_get_type, pFv)
+GO(gtk_print_unix_dialog_get_type, LFv)
 GO(gtk_print_unix_dialog_new, pFpp)
 //GO(gtk_print_unix_dialog_set_current_page, 
 GO(gtk_print_unix_dialog_set_embed_page_setup, vFpi)
@@ -2271,16 +2271,16 @@ GO(gtk_print_unix_dialog_set_manual_capabilities, vFpi)
 //GO(gtk_print_unix_dialog_set_page_setup, 
 GO(gtk_print_unix_dialog_set_settings, vFpp)
 GO(gtk_print_unix_dialog_set_support_selection, vFpi)
-GO(gtk_private_flags_get_type, pFv)
+GO(gtk_private_flags_get_type, LFv)
 GO(gtk_progress_bar_get_ellipsize, uFp)
 GO(gtk_progress_bar_get_fraction, dFp)
 GO(gtk_progress_bar_get_orientation, iFp)
 GO(gtk_progress_bar_get_pulse_step, dFp)
 GO(gtk_progress_bar_get_text, pFp)
-GO(gtk_progress_bar_get_type, pFv)
+GO(gtk_progress_bar_get_type, LFv)
 GO(gtk_progress_bar_new, pFv)
 GO(gtk_progress_bar_new_with_adjustment, pFp)
-GO(gtk_progress_bar_orientation_get_type, pFv)
+GO(gtk_progress_bar_orientation_get_type, LFv)
 GO(gtk_progress_bar_pulse, vFp)
 GO(gtk_progress_bar_set_activity_blocks, vFpu)
 GO(gtk_progress_bar_set_activity_step, vFpu)
@@ -2291,14 +2291,14 @@ GO(gtk_progress_bar_set_fraction, vFpd)
 GO(gtk_progress_bar_set_orientation, vFpi)
 GO(gtk_progress_bar_set_pulse_step, vFpd)
 GO(gtk_progress_bar_set_text, vFpp)
-GO(gtk_progress_bar_style_get_type, pFv)
+GO(gtk_progress_bar_style_get_type, LFv)
 GO(gtk_progress_bar_update, vFpd)
 //GO(gtk_progress_configure, 
 //GO(gtk_progress_get_current_percentage, 
 //GO(gtk_progress_get_current_text, 
 //GO(gtk_progress_get_percentage_from_value, 
 //GO(gtk_progress_get_text_from_value, 
-GO(gtk_progress_get_type, pFv)
+GO(gtk_progress_get_type, LFv)
 //GO(gtk_progress_get_value, 
 //GO(gtk_progress_set_activity_mode, 
 //GO(gtk_progress_set_adjustment, 
@@ -2315,12 +2315,12 @@ GO(gtk_quit_remove, vFu)
 GO(gtk_quit_remove_by_data, vFp)
 GO(gtk_radio_action_get_current_value, iFp)
 GO(gtk_radio_action_get_group, pFp)
-GO(gtk_radio_action_get_type, pFv)
+GO(gtk_radio_action_get_type, LFv)
 GO(gtk_radio_action_new, pFppppi)
 GO(gtk_radio_action_set_current_value, vFpi)
 GO(gtk_radio_action_set_group, vFpp)
 GO(gtk_radio_button_get_group, pFp)
-GO(gtk_radio_button_get_type, pFv)
+GO(gtk_radio_button_get_type, LFv)
 GO(gtk_radio_button_new, pFp)
 GO(gtk_radio_button_new_from_widget, pFp)
 GO(gtk_radio_button_new_with_label, pFpp)
@@ -2329,7 +2329,7 @@ GO(gtk_radio_button_new_with_mnemonic, pFpp)
 GO(gtk_radio_button_new_with_mnemonic_from_widget, pFpp)
 GO(gtk_radio_button_set_group, vFpp)
 GO(gtk_radio_menu_item_get_group, pFp)
-GO(gtk_radio_menu_item_get_type, pFv)
+GO(gtk_radio_menu_item_get_type, LFv)
 GO(gtk_radio_menu_item_new, pFp)
 GO(gtk_radio_menu_item_new_from_widget, pFp)
 GO(gtk_radio_menu_item_new_with_label, pFpp)
@@ -2338,7 +2338,7 @@ GO(gtk_radio_menu_item_new_with_mnemonic, pFpp)
 GO(gtk_radio_menu_item_new_with_mnemonic_from_widget, pFpp)
 GO(gtk_radio_menu_item_set_group, vFpp)
 GO(gtk_radio_tool_button_get_group, pFp)
-GO(gtk_radio_tool_button_get_type, pFv)
+GO(gtk_radio_tool_button_get_type, LFv)
 GO(gtk_radio_tool_button_new, pFp)
 GO(gtk_radio_tool_button_new_from_stock, pFpp)
 GO(gtk_radio_tool_button_new_from_widget, pFp)
@@ -2356,7 +2356,7 @@ GO(gtk_range_get_round_digits, iFp)
 GO(gtk_range_get_show_fill_level, iFp)
 GO(gtk_range_get_slider_range, vFppp)
 GO(gtk_range_get_slider_size_fixed, iFp)
-GO(gtk_range_get_type, pFv)
+GO(gtk_range_get_type, LFv)
 GO(gtk_range_get_update_policy, iFp)
 GO(gtk_range_get_upper_stepper_sensitivity, uFp)
 GO(gtk_range_get_value, dFp)
@@ -2381,7 +2381,7 @@ GO(gtk_rc_add_widget_class_style, vFpp)
 GO(gtk_rc_add_widget_name_style, vFpp)
 GO(gtk_rc_find_module_in_path, pFp)
 GO(gtk_rc_find_pixmap_in_path, pFppp)
-GO(gtk_rc_flags_get_type, pFv)
+GO(gtk_rc_flags_get_type, LFv)
 GO(gtk_rc_get_default_files, pFv)
 GO(gtk_rc_get_im_module_file, pFv)
 GO(gtk_rc_get_im_module_path, pFv)
@@ -2406,23 +2406,23 @@ GO(gtk_rc_reset_styles, vFp)
 GO(gtk_rc_scanner_new, pFv)
 GO(gtk_rc_set_default_files, vFp)
 GO(gtk_rc_style_copy, pFp)
-GO(gtk_rc_style_get_type, pFv)
+GO(gtk_rc_style_get_type, LFv)
 GO(gtk_rc_style_new, pFv)
 GO(gtk_rc_style_ref, vFp)
 GO(gtk_rc_style_unref, vFp)
-GO(gtk_rc_token_type_get_type, pFv)
-GO(gtk_revealer_get_type, pFv)
-GO(gtk_revealer_transition_type_get_type, pFv)
+GO(gtk_rc_token_type_get_type, LFv)
+GO(gtk_revealer_get_type, LFv)
+GO(gtk_revealer_transition_type_get_type, LFv)
 GO(gtk_recent_action_get_show_numbers, iFp)
-GO(gtk_recent_action_get_type, pFv)
+GO(gtk_recent_action_get_type, LFv)
 GO(gtk_recent_action_new, pFpppp)
 GO(gtk_recent_action_new_for_manager, pFppppp)
 GO(gtk_recent_action_set_show_numbers, vFpi)
 //GO(gtk_recent_chooser_add_filter, 
-GO(gtk_recent_chooser_dialog_get_type, pFv)
+GO(gtk_recent_chooser_dialog_get_type, LFv)
 //GO(gtk_recent_chooser_dialog_new, 
 //GO(gtk_recent_chooser_dialog_new_for_manager, 
-GO(gtk_recent_chooser_error_get_type, pFv)
+GO(gtk_recent_chooser_error_get_type, LFv)
 GO(gtk_recent_chooser_error_quark, uFv)
 GO(gtk_recent_chooser_get_current_item, pFp)
 GO(gtk_recent_chooser_get_current_uri, pFp)
@@ -2437,11 +2437,11 @@ GO(gtk_recent_chooser_get_show_icons, iFp)
 //GO(gtk_recent_chooser_get_show_private, 
 //GO(gtk_recent_chooser_get_show_tips, 
 GO(gtk_recent_chooser_get_sort_type, uFp)
-GO(gtk_recent_chooser_get_type, pFv)
+GO(gtk_recent_chooser_get_type, LFv)
 GO(gtk_recent_chooser_get_uris, pFpp)
 GO(gtk_recent_chooser_list_filters, pFp)
 GO(gtk_recent_chooser_menu_get_show_numbers, iFp)
-GO(gtk_recent_chooser_menu_get_type, pFv)
+GO(gtk_recent_chooser_menu_get_type, LFv)
 //GO(gtk_recent_chooser_menu_new, 
 //GO(gtk_recent_chooser_menu_new_for_manager, 
 GO(gtk_recent_chooser_menu_set_show_numbers, vFpi)
@@ -2462,7 +2462,7 @@ GO(gtk_recent_chooser_set_show_icons, vFpi)
 GO(gtk_recent_chooser_set_sort_type, vFpu)
 //GO(gtk_recent_chooser_unselect_all, 
 GO(gtk_recent_chooser_unselect_uri, vFpp)
-GO(gtk_recent_chooser_widget_get_type, pFv)
+GO(gtk_recent_chooser_widget_get_type, LFv)
 //GO(gtk_recent_chooser_widget_new, 
 GO(gtk_recent_chooser_widget_new_for_manager, pFp)
 GO(gtk_recent_filter_add_age, vFpi)
@@ -2473,10 +2473,10 @@ GO(gtk_recent_filter_add_group, vFpp)
 //GO(gtk_recent_filter_add_pattern, 
 //GO(gtk_recent_filter_add_pixbuf_formats, 
 GO(gtk_recent_filter_filter, iFpp)
-GO(gtk_recent_filter_flags_get_type, pFv)
+GO(gtk_recent_filter_flags_get_type, LFv)
 GO(gtk_recent_filter_get_name, pFp)
 GO(gtk_recent_filter_get_needed, uFp)
-GO(gtk_recent_filter_get_type, pFv)
+GO(gtk_recent_filter_get_type, LFv)
 GO(gtk_recent_filter_new, pFv)
 //GO(gtk_recent_filter_set_name, 
 GO(gtk_recent_info_exists, iFp)
@@ -2492,7 +2492,7 @@ GO(gtk_recent_info_get_mime_type, pFp)
 //GO(gtk_recent_info_get_modified, 
 //GO(gtk_recent_info_get_private_hint, 
 //GO(gtk_recent_info_get_short_name, 
-GO(gtk_recent_info_get_type, pFv)
+GO(gtk_recent_info_get_type, LFv)
 //GO(gtk_recent_info_get_uri, 
 GO(gtk_recent_info_get_uri_display, pFp)
 GO(gtk_recent_info_get_visited, lFp)
@@ -2505,13 +2505,13 @@ GO(gtk_recent_info_ref, pFp)
 GO(gtk_recent_info_unref, vFp)
 GO(gtk_recent_manager_add_full, iFppp)
 //GO(gtk_recent_manager_add_item, 
-GO(gtk_recent_manager_error_get_type, pFv)
+GO(gtk_recent_manager_error_get_type, LFv)
 //GO(gtk_recent_manager_error_quark, 
 GO(gtk_recent_manager_get_default, pFv)
 //GO(gtk_recent_manager_get_for_screen, 
 GO(gtk_recent_manager_get_items, pFp)
 //GO(gtk_recent_manager_get_limit, 
-GO(gtk_recent_manager_get_type, pFv)
+GO(gtk_recent_manager_get_type, LFv)
 GO(gtk_recent_manager_has_item, iFpp)
 GO(gtk_recent_manager_lookup_item, pFppp)
 GO(gtk_recent_manager_move_item, iFpppp)
@@ -2520,8 +2520,8 @@ GO(gtk_recent_manager_purge_items, iFpp)
 GO(gtk_recent_manager_remove_item, iFppp)
 //GO(gtk_recent_manager_set_limit, 
 //GO(gtk_recent_manager_set_screen, 
-GO(gtk_recent_sort_type_get_type, pFv)
-GO(gtk_relief_style_get_type, pFv)
+GO(gtk_recent_sort_type_get_type, LFv)
+GO(gtk_relief_style_get_type, LFv)
 GO(gtk_render_activity, vFppdddd)
 GO(gtk_render_arrow, vFppdddd)
 GO(gtk_render_background, vFppdddd)
@@ -2543,15 +2543,15 @@ GO(gtk_render_option, vFppdddd)
 GO(gtk_render_slider, vFppddddu)
 GO(gtk_requisition_copy, pFp)
 GO(gtk_requisition_free, vFp)
-GO(gtk_requisition_get_type, pFv)
-GO(gtk_resize_mode_get_type, pFv)
-GO(gtk_response_type_get_type, pFv)
+GO(gtk_requisition_get_type, LFv)
+GO(gtk_resize_mode_get_type, LFv)
+GO(gtk_response_type_get_type, LFv)
 GO(gtk_rgb_to_hsv, vFdddppp)
 //GO(gtk_ruler_draw_pos, 
 //GO(gtk_ruler_draw_ticks, 
 //GO(gtk_ruler_get_metric, 
 //GO(gtk_ruler_get_range, 
-GO(gtk_ruler_get_type, pFv)
+GO(gtk_ruler_get_type, LFv)
 //GO(gtk_ruler_set_metric, 
 //GO(gtk_ruler_set_range, 
 GO(gtk_scale_add_mark, vFpdup)
@@ -2560,7 +2560,7 @@ GO(gtk_scale_button_get_adjustment, pFp)
 //GO(gtk_scale_button_get_orientation, 
 //GO(gtk_scale_button_get_plus_button, 
 GO(gtk_scale_button_get_popup, pFp)
-GO(gtk_scale_button_get_type, pFv)
+GO(gtk_scale_button_get_type, LFv)
 GO(gtk_scale_button_get_value, dFp)
 GO(gtk_scale_button_new, pFudddp)
 GO(gtk_scale_button_set_adjustment, vFpp)
@@ -2572,19 +2572,19 @@ GO(gtk_scale_get_digits, iFp)
 //GO(gtk_scale_get_draw_value, 
 GO(gtk_scale_get_layout, pFp)
 GO(gtk_scale_get_layout_offsets, vFppp)
-GO(gtk_scale_get_type, pFv)
+GO(gtk_scale_get_type, LFv)
 GO(gtk_scale_get_value_pos, uFp)
 GO(gtk_scale_set_digits, vFpi)
 //GO(gtk_scale_set_draw_value, 
 GO(gtk_scale_set_value_pos, vFpu)
-GO(gtk_scrollbar_get_type, pFv)
+GO(gtk_scrollbar_get_type, LFv)
 GO(gtk_scrolled_window_add_with_viewport, vFpp)
 GO(gtk_scrolled_window_get_hadjustment, pFp)
 GO(gtk_scrolled_window_get_hscrollbar, pFp)
 GO(gtk_scrolled_window_get_placement, uFp)
 GO(gtk_scrolled_window_get_policy, vFppp)
 GO(gtk_scrolled_window_get_shadow_type, uFp)
-GO(gtk_scrolled_window_get_type, pFv)
+GO(gtk_scrolled_window_get_type, LFv)
 GO(gtk_scrolled_window_get_vadjustment, pFp)
 GO(gtk_scrolled_window_get_vscrollbar, pFp)
 GO(gtk_scrolled_window_new, pFpp)
@@ -2594,10 +2594,10 @@ GO(gtk_scrolled_window_set_policy, vFpuu)
 GO(gtk_scrolled_window_set_shadow_type, vFpu)
 GO(gtk_scrolled_window_set_vadjustment, vFpp)
 GO(gtk_scrolled_window_unset_placement, vFp)
-GO(gtk_scroll_step_get_type, pFv)
-GO(gtk_scroll_type_get_type, pFv)
-GO(gtk_search_bar_get_type, pFv)
-GO(gtk_search_entry_get_type, pFv)
+GO(gtk_scroll_step_get_type, LFv)
+GO(gtk_scroll_type_get_type, LFv)
+GO(gtk_search_bar_get_type, LFv)
+GO(gtk_search_entry_get_type, LFv)
 GO(gtk_selection_add_target, vFpppu)
 GO(gtk_selection_add_targets, vFpppu)
 GO(gtk_selection_clear, iFpp)
@@ -2615,7 +2615,7 @@ GO(gtk_selection_data_get_selection, pFp)
 GO(gtk_selection_data_get_target, pFp)
 GO(gtk_selection_data_get_targets, iFppp)
 GO(gtk_selection_data_get_text, pFp)
-GO(gtk_selection_data_get_type, pFv)
+GO(gtk_selection_data_get_type, LFv)
 GO(gtk_selection_data_get_uris, pFp)
 GO(gtk_selection_data_set, vFppipi)
 GO(gtk_selection_data_set_pixbuf, iFpp)
@@ -2625,34 +2625,34 @@ GO(gtk_selection_data_targets_include_image, iFpi)
 GO(gtk_selection_data_targets_include_rich_text, iFpp)
 GO(gtk_selection_data_targets_include_text, iFp)
 GO(gtk_selection_data_targets_include_uri, iFp)
-GO(gtk_selection_mode_get_type, pFv)
+GO(gtk_selection_mode_get_type, LFv)
 GO(gtk_selection_owner_set, iFppu)
 GO(gtk_selection_owner_set_for_display, iFpppu)
 GO(gtk_selection_remove_all, vFp)
-GO(gtk_sensitivity_type_get_type, pFv)
-GO(gtk_separator_get_type, pFv)
-GO(gtk_separator_menu_item_get_type, pFv)
+GO(gtk_sensitivity_type_get_type, LFv)
+GO(gtk_separator_get_type, LFv)
+GO(gtk_separator_menu_item_get_type, LFv)
 GO(gtk_separator_menu_item_new, pFv)
 GO(gtk_separator_new, pFu)
 GO(gtk_separator_tool_item_get_draw, iFp)
-GO(gtk_separator_tool_item_get_type, pFv)
+GO(gtk_separator_tool_item_get_type, LFv)
 GO(gtk_separator_tool_item_new, pFv)
 GO(gtk_separator_tool_item_set_draw, vFpi)
 GO(gtk_set_locale, pFv)
 GO(gtk_settings_get_default, pFv)
 GO(gtk_settings_get_for_screen, pFp)
-GO(gtk_settings_get_type, pFv)
+GO(gtk_settings_get_type, LFv)
 GO(gtk_settings_install_property, vFp)
 //GOM(gtk_settings_install_property_parser, vFEpB)
 GO(gtk_settings_set_double_property, vFppdp)
 GO(gtk_settings_set_long_property, vFpplp)
 GO(gtk_settings_set_property_value, vFppp)
 GO(gtk_settings_set_string_property, vFpppp)
-GO(gtk_shadow_type_get_type, pFv)
+GO(gtk_shadow_type_get_type, LFv)
 GO(gtk_show_about_dialog, vFpppppppppppppppppppppppp)   //vaarg
 GO(gtk_show_uri, iFppup)
 GO(gtk_show_uri_on_window, iFppup)
-GO(gtk_side_type_get_type, pFv)
+GO(gtk_side_type_get_type, LFv)
 //GO(gtk_signal_compat_matched, 
 GOM(gtk_signal_connect_full, LFEppppppii)
 //GO(gtk_signal_connect_object_while_alive, 
@@ -2664,13 +2664,13 @@ GOM(gtk_signal_connect_full, LFEppppppii)
 //GO(gtk_signal_emitv_by_name, 
 //GO(gtk_signal_new, 
 //GO(gtk_signal_newv, 
-GO(gtk_signal_run_type_get_type, pFv)
+GO(gtk_signal_run_type_get_type, LFv)
 //GO(gtk_size_group_add_widget, 
 GO(gtk_size_group_get_ignore_hidden, iFp)
 GO(gtk_size_group_get_mode, uFp)
-GO(gtk_size_group_get_type, pFv)
+GO(gtk_size_group_get_type, LFv)
 GO(gtk_size_group_get_widgets, pFp)
-GO(gtk_size_group_mode_get_type, pFv)
+GO(gtk_size_group_mode_get_type, LFv)
 GO(gtk_size_group_new, pFu)
 GO(gtk_size_group_remove_widget, vFpp)
 GO(gtk_size_group_set_ignore_hidden, vFpi)
@@ -2681,10 +2681,10 @@ GO(gtk_snapshot_render_background, vFppdddd)
 GO(gtk_socket_add_id, vFpp)
 GO(gtk_socket_get_id, pFp)
 GO(gtk_socket_get_plug_window, pFp)
-GO(gtk_socket_get_type, pFv)
+GO(gtk_socket_get_type, LFv)
 GO(gtk_socket_new, pFv)
 GO(gtk_socket_steal, vFpp)
-GO(gtk_sort_type_get_type, pFv)
+GO(gtk_sort_type_get_type, LFv)
 GO(gtk_spin_button_configure, vFppdu)
 GO(gtk_spin_button_get_adjustment, pFp)
 GO(gtk_spin_button_get_digits, uFp)
@@ -2692,7 +2692,7 @@ GO(gtk_spin_button_get_increments, vFppp)
 GO(gtk_spin_button_get_numeric, iFp)
 GO(gtk_spin_button_get_range, vFppp)
 GO(gtk_spin_button_get_snap_to_ticks, iFp)
-GO(gtk_spin_button_get_type, pFv)
+GO(gtk_spin_button_get_type, LFv)
 GO(gtk_spin_button_get_update_policy, uFp)
 GO(gtk_spin_button_get_value, dFp)
 GO(gtk_spin_button_get_value_as_int, iFp)
@@ -2710,21 +2710,21 @@ GO(gtk_spin_button_set_value, vFpd)
 GO(gtk_spin_button_set_wrap, vFpi)
 GO(gtk_spin_button_spin, vFpud)
 GO(gtk_spin_button_update, vFp)
-GO(gtk_spin_button_update_policy_get_type, pFv)
-GO(gtk_spinner_get_type, pFv)
+GO(gtk_spin_button_update_policy_get_type, LFv)
+GO(gtk_spinner_get_type, LFv)
 GO(gtk_spinner_new, pFv)
 GO(gtk_spinner_start, vFp)
 GO(gtk_spinner_stop, vFp)
-GO(gtk_spin_type_get_type, pFv)
-GO(gtk_stack_get_type, pFv)
-GO(gtk_stack_switcher_get_type, pFv)
-GO(gtk_stack_transition_type_get_type, pFv)
-GO(gtk_state_flags_get_type, pFv)
-GO(gtk_state_type_get_type, pFv)
+GO(gtk_spin_type_get_type, LFv)
+GO(gtk_stack_get_type, LFv)
+GO(gtk_stack_switcher_get_type, LFv)
+GO(gtk_stack_transition_type_get_type, LFv)
+GO(gtk_state_flags_get_type, LFv)
+GO(gtk_state_type_get_type, LFv)
 GO(gtk_statusbar_get_context_id, uFpp)
 GO(gtk_statusbar_get_has_resize_grip, iFp)
 GO(gtk_statusbar_get_message_area, pFp)
-GO(gtk_statusbar_get_type, pFv)
+GO(gtk_statusbar_get_type, LFv)
 GO(gtk_statusbar_new, pFv)
 GO(gtk_statusbar_pop, vFpu)
 GO(gtk_statusbar_push, uFpup)
@@ -2744,7 +2744,7 @@ GO(gtk_status_icon_get_storage_type, uFp)
 GO(gtk_status_icon_get_title, pFp)
 GO(gtk_status_icon_get_tooltip_markup, pFp)
 GO(gtk_status_icon_get_tooltip_text, pFp)
-GO(gtk_status_icon_get_type, pFv)
+GO(gtk_status_icon_get_type, LFv)
 GO(gtk_status_icon_get_visible, iFp)
 GO(gtk_status_icon_get_x11_window_id, uFp)
 GO(gtk_status_icon_is_embedded, iFp)
@@ -2842,7 +2842,7 @@ GO(gtk_style_detach, vFp)
 GO(gtk_style_get, vFpippppppppppp)  //vaarg, wrap with gtk_style_get_valist?
 GO(gtk_style_get_font, pFp)
 GO(gtk_style_get_style_property, vFpLpp)
-GO(gtk_style_get_type, pFv)
+GO(gtk_style_get_type, LFv)
 //GO(gtk_style_get_valist, vFpipA)
 GO(gtk_style_lookup_color, iFppp)
 GO(gtk_style_lookup_icon_set, pFpp)
@@ -2851,11 +2851,11 @@ GO(gtk_style_ref, pFp)
 GO(gtk_style_render_icon, pFppuuupp)
 GO(gtk_style_set_background, vFppu)
 GO(gtk_style_set_font, vFpp)
-GO(gtk_style_provider_get_type, pFv)
+GO(gtk_style_provider_get_type, LFv)
 GO(gtk_style_unref, vFp)
-GO(gtk_submenu_direction_get_type, pFv)
-GO(gtk_submenu_placement_get_type, pFv)
-GO(gtk_switch_get_type, pFv)
+GO(gtk_submenu_direction_get_type, LFv)
+GO(gtk_submenu_placement_get_type, LFv)
+GO(gtk_switch_get_type, LFv)
 GO(gtk_table_attach, vFppuuuuuuuu)
 GO(gtk_table_attach_defaults, vFppuuuu)
 GO(gtk_table_get_col_spacing, uFpu)
@@ -2864,7 +2864,7 @@ GO(gtk_table_get_default_row_spacing, uFp)
 GO(gtk_table_get_homogeneous, iFp)
 GO(gtk_table_get_row_spacing, uFpu)
 GO(gtk_table_get_size, vFppp)
-GO(gtk_table_get_type, pFv)
+GO(gtk_table_get_type, LFv)
 GO(gtk_table_new, pFuui)
 GO(gtk_table_resize, vFpuu)
 GO(gtk_table_set_col_spacing, vFpuu)
@@ -2872,8 +2872,8 @@ GO(gtk_table_set_col_spacings, vFpu)
 GO(gtk_table_set_homogeneous, vFpi)
 GO(gtk_table_set_row_spacing, vFpuu)
 GO(gtk_table_set_row_spacings, vFpu)
-GO(gtk_target_entry_get_type, pFv)
-GO(gtk_target_flags_get_type, pFv)
+GO(gtk_target_entry_get_type, LFv)
+GO(gtk_target_flags_get_type, LFv)
 GO(gtk_target_list_add, vFppuu)
 GO(gtk_target_list_add_image_targets, vFpui)
 GO(gtk_target_list_add_rich_text_targets, vFpuip)
@@ -2881,7 +2881,7 @@ GO(gtk_target_list_add_table, vFppu)
 GO(gtk_target_list_add_text_targets, vFpu)
 GO(gtk_target_list_add_uri_targets, vFpu)
 GO(gtk_target_list_find, iFppp)
-GO(gtk_target_list_get_type, pFv)
+GO(gtk_target_list_get_type, LFv)
 GO(gtk_target_list_new, pFpu)
 GO(gtk_target_list_ref, pFp)
 GO(gtk_target_list_remove, vFpp)
@@ -2892,7 +2892,7 @@ GO(gtk_targets_include_text, iFpi)
 GO(gtk_targets_include_uri, iFpi)
 GO(gtk_target_table_free, vFpi)
 GO(gtk_target_table_new_from_list, pFpp)
-GO(gtk_tearoff_menu_item_get_type, pFv)
+GO(gtk_tearoff_menu_item_get_type, LFv)
 GO(gtk_tearoff_menu_item_new, pFv)
 GO(gtk_test_create_simple_window, pFpp)
 //GO(gtk_test_create_widget, 
@@ -2913,7 +2913,7 @@ GO(gtk_test_widget_send_key, iFpuu)
 GO(gtk_text_anchored_child_set_layout, vFpp)
 GO(gtk_text_attributes_copy, pFp)
 GO(gtk_text_attributes_copy_values, vFpp)
-GO(gtk_text_attributes_get_type, pFv)
+GO(gtk_text_attributes_get_type, LFv)
 GO(gtk_text_attributes_new, pFv)
 GO(gtk_text_attributes_ref, pFp)
 GO(gtk_text_attributes_unref, vFp)
@@ -2962,7 +2962,7 @@ GO(gtk_text_buffer_get_slice, pFpppi)
 GO(gtk_text_buffer_get_start_iter, vFpp)
 GO(gtk_text_buffer_get_tag_table, pFp)
 GO(gtk_text_buffer_get_text, pFpppi)
-GO(gtk_text_buffer_get_type, pFv)
+GO(gtk_text_buffer_get_type, LFv)
 GO(gtk_text_buffer_insert, vFpppi)
 GO(gtk_text_buffer_insert_at_cursor, vFppi)
 GO(gtk_text_buffer_insert_child_anchor, vFppp)
@@ -2990,23 +2990,23 @@ GO(gtk_text_buffer_select_range, vFppp)
 GO(gtk_text_buffer_serialize, pFpppppp)
 GO(gtk_text_buffer_set_modified, vFpi)
 GO(gtk_text_buffer_set_text, vFppi)
-GO(gtk_text_buffer_target_info_get_type, pFv)
+GO(gtk_text_buffer_target_info_get_type, LFv)
 GO(gtk_text_buffer_unregister_deserialize_format, vFpp)
 GO(gtk_text_buffer_unregister_serialize_format, vFpp)
 GO(gtk_text_byte_begins_utf8_char, iFp)
 GO(gtk_text_child_anchor_get_deleted, iFp)
-GO(gtk_text_child_anchor_get_type, pFv)
+GO(gtk_text_child_anchor_get_type, LFv)
 GO(gtk_text_child_anchor_get_widgets, pFp)
 GO(gtk_text_child_anchor_new, pFv)
 GO(gtk_text_child_anchor_queue_resize, vFpp)
 GO(gtk_text_child_anchor_register_child, vFppp)
 GO(gtk_text_child_anchor_unregister_child, vFpp)
-GO(gtk_text_direction_get_type, pFv)
+GO(gtk_text_direction_get_type, LFv)
 GO(gtk_text_forward_delete, iFpu)
 GO(gtk_text_freeze, vFp)
 GO(gtk_text_get_length, uFp)
 GO(gtk_text_get_point, uFp)
-GO(gtk_text_get_type, pFv)
+GO(gtk_text_get_type, LFv)
 GO(gtk_text_insert, vFpppppi)
 GO(gtk_text_iter_backward_char, iFp)
 GO(gtk_text_iter_backward_chars, iFpi)
@@ -3076,7 +3076,7 @@ GO(gtk_text_iter_get_slice, pFpp)
 GO(gtk_text_iter_get_tags, pFp)
 GO(gtk_text_iter_get_text, pFpp)
 GO(gtk_text_iter_get_toggled_tags, pFpi)
-GO(gtk_text_iter_get_type, pFv)
+GO(gtk_text_iter_get_type, LFv)
 GO(gtk_text_iter_get_visible_line_index, iFp)
 GO(gtk_text_iter_get_visible_line_offset, iFp)
 GO(gtk_text_iter_get_visible_slice, pFpp)
@@ -3118,7 +3118,7 @@ GO(gtk_text_iter_toggles_tag, iFpp)
 //GO(gtk_text_layout_get_lines, 
 //GO(gtk_text_layout_get_line_yrange, 
 //GO(gtk_text_layout_get_size, 
-GO(gtk_text_layout_get_type, pFv)
+GO(gtk_text_layout_get_type, LFv)
 //GO(gtk_text_layout_invalidate, 
 //GO(gtk_text_layout_invalidate_cursors, 
 //GO(gtk_text_layout_is_valid, 
@@ -3149,12 +3149,12 @@ GO(gtk_text_mark_get_buffer, pFp)
 GO(gtk_text_mark_get_deleted, iFp)
 GO(gtk_text_mark_get_left_gravity, iFp)
 GO(gtk_text_mark_get_name, pFp)
-GO(gtk_text_mark_get_type, pFv)
+GO(gtk_text_mark_get_type, LFv)
 GO(gtk_text_mark_get_visible, iFp)
 GO(gtk_text_mark_new, pFpi)
 GO(gtk_text_mark_set_visible, vFpi)
 GO(gtk_text_new, pFpp)
-GO(gtk_text_search_flags_get_type, pFv)
+GO(gtk_text_search_flags_get_type, LFv)
 GO(gtk_text_set_adjustments, vFppp)
 GO(gtk_text_set_editable, vFpi)
 GO(gtk_text_set_line_wrap, vFpi)
@@ -3162,13 +3162,13 @@ GO(gtk_text_set_point, vFpu)
 GO(gtk_text_set_word_wrap, vFpi)
 GO(gtk_text_tag_event, iFpppp)
 GO(gtk_text_tag_get_priority, iFp)
-GO(gtk_text_tag_get_type, pFv)
+GO(gtk_text_tag_get_type, LFv)
 GO(gtk_text_tag_new, pFp)
 GO(gtk_text_tag_set_priority, vFpi)
 GO(gtk_text_tag_table_add, iFpp)
 //GOM(gtk_text_tag_table_foreach, vFEpBp)
 GO(gtk_text_tag_table_get_size, iFp)
-GO(gtk_text_tag_table_get_type, pFv)
+GO(gtk_text_tag_table_get_type, LFv)
 GO(gtk_text_tag_table_lookup, pFpp)
 GO(gtk_text_tag_table_new, pFv)
 GO(gtk_text_tag_table_remove, vFpp)
@@ -3201,7 +3201,7 @@ GO(gtk_text_view_get_pixels_below_lines, iFp)
 GO(gtk_text_view_get_pixels_inside_wrap, iFp)
 GO(gtk_text_view_get_right_margin, iFp)
 GO(gtk_text_view_get_tabs, pFp)
-GO(gtk_text_view_get_type, pFv)
+GO(gtk_text_view_get_type, LFv)
 GO(gtk_text_view_get_vadjustment, pFp)
 GO(gtk_text_view_get_visible_rect, vFpp)
 GO(gtk_text_view_get_window, pFpu)
@@ -3235,14 +3235,14 @@ GO(gtk_text_view_set_tabs, vFpp)
 GO(gtk_text_view_set_wrap_mode, vFpu)
 GO(gtk_text_view_starts_display_line, iFpp)
 GO(gtk_text_view_window_to_buffer_coords, vFpuiipp)
-GO(gtk_text_window_type_get_type, pFv)
+GO(gtk_text_window_type_get_type, LFv)
 //GO(gtk_theme_engine_create_rc_style, 
 //GO(gtk_theme_engine_get, 
-GO(gtk_theme_engine_get_type, pFv)
+GO(gtk_theme_engine_get_type, LFv)
 GOM(gtk_timeout_add, uFEupp)
 //GOM(gtk_timeout_add_full, uFuBppB)
 GO(gtk_timeout_remove, vFu)
-GO(gtk_tips_query_get_type, pFv)
+GO(gtk_tips_query_get_type, LFv)
 //GO(gtk_tips_query_new, 
 //GO(gtk_tips_query_set_caller, 
 //GO(gtk_tips_query_set_labels, 
@@ -3250,7 +3250,7 @@ GO(gtk_tips_query_get_type, pFv)
 //GO(gtk_tips_query_stop_query, 
 //GO(gtk_toggle_action_get_active, 
 GO(gtk_toggle_action_get_draw_as_radio, iFp)
-GO(gtk_toggle_action_get_type, pFv)
+GO(gtk_toggle_action_get_type, LFv)
 GO(gtk_toggle_action_new, pFpppp)
 //GO(gtk_toggle_action_set_active, 
 //GO(gtk_toggle_action_set_draw_as_radio, 
@@ -3258,7 +3258,7 @@ GO(gtk_toggle_action_toggled, vFp)
 GO(gtk_toggle_button_get_active, iFp)
 GO(gtk_toggle_button_get_inconsistent, iFp)
 GO(gtk_toggle_button_get_mode, iFp)
-GO(gtk_toggle_button_get_type, pFv)
+GO(gtk_toggle_button_get_type, LFv)
 GO(gtk_toggle_button_new, pFv)
 GO(gtk_toggle_button_new_with_label, pFp)
 GO(gtk_toggle_button_new_with_mnemonic, pFp)
@@ -3267,7 +3267,7 @@ GO(gtk_toggle_button_set_inconsistent, vFpi)
 GO(gtk_toggle_button_set_mode, vFpi)
 GO(gtk_toggle_button_toggled, vFp)
 GO(gtk_toggle_tool_button_get_active, iFp)
-GO(gtk_toggle_tool_button_get_type, pFv)
+GO(gtk_toggle_tool_button_get_type, LFv)
 GO(gtk_toggle_tool_button_new, pFv)
 GO(gtk_toggle_tool_button_new_from_stock, pFp)
 GO(gtk_toggle_tool_button_set_active, vFpi)
@@ -3275,7 +3275,7 @@ GOM(gtk_toolbar_append_element, pFEpippppppp)
 GOM(gtk_toolbar_append_item, pFEppppppp)
 GO(gtk_toolbar_append_space, vFp)
 GO(gtk_toolbar_append_widget, vFpppp)
-GO(gtk_toolbar_child_type_get_type, pFv)
+GO(gtk_toolbar_child_type_get_type, LFv)
 GO(gtk_toolbar_get_drop_index, iFpii)
 GO(gtk_toolbar_get_icon_size, uFp)
 GO(gtk_toolbar_get_item_index, iFpp)
@@ -3286,7 +3286,7 @@ GO(gtk_toolbar_get_relief_style, uFp)
 GO(gtk_toolbar_get_show_arrow, iFp)
 GO(gtk_toolbar_get_style, uFp)
 GO(gtk_toolbar_get_tooltips, iFp)
-GO(gtk_toolbar_get_type, pFv)
+GO(gtk_toolbar_get_type, LFv)
 GO(gtk_toolbar_insert, vFppi)
 GOM(gtk_toolbar_insert_element, pFEpipppppppi)
 GOM(gtk_toolbar_insert_item, pFEpppppppi)
@@ -3305,8 +3305,8 @@ GO(gtk_toolbar_set_orientation, vFpi)
 GO(gtk_toolbar_set_show_arrow, vFpi)
 GO(gtk_toolbar_set_style, vFpu)
 GO(gtk_toolbar_set_tooltips, vFpi)
-GO(gtk_toolbar_space_style_get_type, pFv)
-GO(gtk_toolbar_style_get_type, pFv)
+GO(gtk_toolbar_space_style_get_type, LFv)
+GO(gtk_toolbar_style_get_type, LFv)
 GO(gtk_toolbar_unset_icon_size, vFp)
 GO(gtk_toolbar_unset_style, vFp)
 GO(gtk_tool_button_get_icon_name, pFp)
@@ -3314,7 +3314,7 @@ GO(gtk_tool_button_get_icon_widget, pFp)
 GO(gtk_tool_button_get_label, pFp)
 GO(gtk_tool_button_get_label_widget, pFp)
 GO(gtk_tool_button_get_stock_id, pFp)
-GO(gtk_tool_button_get_type, pFv)
+GO(gtk_tool_button_get_type, LFv)
 GO(gtk_tool_button_get_use_underline, iFp)
 GO(gtk_tool_button_new, pFpp)
 GO(gtk_tool_button_new_from_stock, pFp)
@@ -3336,7 +3336,7 @@ GO(gtk_tool_item_get_text_alignment, fFp)
 GO(gtk_tool_item_get_text_orientation, uFp)
 GO(gtk_tool_item_get_text_size_group, pFp)
 GO(gtk_tool_item_get_toolbar_style, uFp)
-GO(gtk_tool_item_get_type, pFv)
+GO(gtk_tool_item_get_type, LFv)
 //GO(gtk_tool_item_get_use_drag_window, 
 //GO(gtk_tool_item_get_visible_horizontal, 
 //GO(gtk_tool_item_get_visible_vertical, 
@@ -3349,7 +3349,7 @@ GO(gtk_tool_item_group_get_label, pFp)
 GO(gtk_tool_item_group_get_label_widget, pFp)
 GO(gtk_tool_item_group_get_n_items, uFp)
 GO(gtk_tool_item_group_get_nth_item, pFpu)
-GO(gtk_tool_item_group_get_type, pFv)
+GO(gtk_tool_item_group_get_type, LFv)
 //GO(gtk_tool_item_group_insert, 
 //GO(gtk_tool_item_group_new, 
 GO(gtk_tool_item_group_set_collapsed, vFpi)
@@ -3373,7 +3373,7 @@ GO(gtk_tool_item_set_tooltip_markup, vFpp)
 //GO(gtk_tool_item_set_visible_vertical, 
 //GO(gtk_tool_item_toolbar_reconfigured, 
 GO(gtk_tool_palette_add_drag_dest, vFppuuu)
-GO(gtk_tool_palette_drag_targets_get_type, pFv)
+GO(gtk_tool_palette_drag_targets_get_type, LFv)
 GO(gtk_tool_palette_get_drag_item, pFpp)
 GO(gtk_tool_palette_get_drag_target_group, pFv)
 //GO(gtk_tool_palette_get_drag_target_item, 
@@ -3385,7 +3385,7 @@ GO(gtk_tool_palette_get_group_position, iFpp)
 //GO(gtk_tool_palette_get_hadjustment, 
 GO(gtk_tool_palette_get_icon_size, uFp)
 GO(gtk_tool_palette_get_style, uFp)
-GO(gtk_tool_palette_get_type, pFv)
+GO(gtk_tool_palette_get_type, LFv)
 GO(gtk_tool_palette_get_vadjustment, pFp)
 //GO(gtk_tool_palette_new, 
 GO(gtk_tool_palette_set_drag_source, vFpu)
@@ -3404,9 +3404,9 @@ GO(gtk_tool_shell_get_style, uFp)
 GO(gtk_tool_shell_get_text_alignment, fFp)
 GO(gtk_tool_shell_get_text_orientation, uFp)
 GO(gtk_tool_shell_get_text_size_group, pFp)
-GO(gtk_tool_shell_get_type, pFv)
+GO(gtk_tool_shell_get_type, LFv)
 //GO(gtk_tool_shell_rebuild_menu, 
-GO(gtk_tooltip_get_type, pFv)
+GO(gtk_tooltip_get_type, LFv)
 GO(gtk_tooltips_data_get, pFp)
 GO(gtk_tooltips_disable, vFp)
 GO(gtk_tooltips_enable, vFp)
@@ -3420,29 +3420,29 @@ GO(gtk_tooltip_set_text, vFpp)
 GO(gtk_tooltip_set_tip_area, vFpp)
 GO(gtk_tooltips_force_window, vFp)
 GO(gtk_tooltips_get_info_from_tip_window, iFppp)
-GO(gtk_tooltips_get_type, pFv)
+GO(gtk_tooltips_get_type, LFv)
 GO(gtk_tooltips_new, pFv)
 GO(gtk_tooltips_set_delay, vFpu)
 GO(gtk_tooltips_set_tip, vFpppp)
 GO(gtk_tooltip_trigger_tooltip_query, vFp)
-GO(gtk_tray_icon_get_type, pFv)
+GO(gtk_tray_icon_get_type, LFv)
 //GO(gtk_tree_append, 
 //GO(gtk_tree_child_position, 
 //GO(gtk_tree_clear_items, 
 //GO(gtk_tree_drag_dest_drag_data_received, 
-GO(gtk_tree_drag_dest_get_type, pFv)
+GO(gtk_tree_drag_dest_get_type, LFv)
 GO(gtk_tree_drag_dest_row_drop_possible, iFppp)
 GO(gtk_tree_drag_source_drag_data_delete, iFpp)
 GO(gtk_tree_drag_source_drag_data_get, iFppp)
-GO(gtk_tree_drag_source_get_type, pFv)
+GO(gtk_tree_drag_source_get_type, LFv)
 //GO(gtk_tree_drag_source_row_draggable, 
 GO(gtk_tree_get_row_drag_data, iFppp)
-GO(gtk_tree_get_type, pFv)
+GO(gtk_tree_get_type, LFv)
 //GO(gtk_tree_insert, 
 //GO(gtk_tree_item_collapse, 
 //GO(gtk_tree_item_deselect, 
 //GO(gtk_tree_item_expand, 
-GO(gtk_tree_item_get_type, pFv)
+GO(gtk_tree_item_get_type, LFv)
 //GO(gtk_tree_item_new, 
 //GO(gtk_tree_item_new_with_label, 
 //GO(gtk_tree_item_remove_subtree, 
@@ -3450,20 +3450,20 @@ GO(gtk_tree_item_get_type, pFv)
 //GO(gtk_tree_item_set_subtree, 
 GO(gtk_tree_iter_copy, pFp)
 GO(gtk_tree_iter_free, vFp)
-GO(gtk_tree_iter_get_type, pFv)
+GO(gtk_tree_iter_get_type, LFv)
 //GO(gtk_tree_model_filter_clear_cache, 
 GO(gtk_tree_model_filter_convert_child_iter_to_iter, iFppp)
 //GO(gtk_tree_model_filter_convert_child_path_to_path, 
 GO(gtk_tree_model_filter_convert_iter_to_child_iter, vFppp)
 GO(gtk_tree_model_filter_convert_path_to_child_path, pFpp)
 GO(gtk_tree_model_filter_get_model, pFp)
-GO(gtk_tree_model_filter_get_type, pFv)
+GO(gtk_tree_model_filter_get_type, LFv)
 GO(gtk_tree_model_filter_new, pFpp)
 //GO(gtk_tree_model_filter_refilter, 
 //GO(gtk_tree_model_filter_set_modify_func, 
 GO(gtk_tree_model_filter_set_visible_column, vFpi)
 //GO(gtk_tree_model_filter_set_visible_func, 
-GO(gtk_tree_model_flags_get_type, pFv)
+GO(gtk_tree_model_flags_get_type, LFv)
 //GOM(gtk_tree_model_foreach, vFEpBp)
 //GO2(gtk_tree_model_get, vFppV, gtk_tree_model_get_valist)
 GO(gtk_tree_model_get_column_type, LFpi)
@@ -3474,7 +3474,7 @@ GO(gtk_tree_model_get_iter_from_string, iFppp)
 GO(gtk_tree_model_get_n_columns, iFp)
 GO(gtk_tree_model_get_path, pFpp)
 GO(gtk_tree_model_get_string_from_iter, pFpp)
-GO(gtk_tree_model_get_type, pFv)
+GO(gtk_tree_model_get_type, LFv)
 //GO(gtk_tree_model_get_valist, vFppp)
 GO(gtk_tree_model_get_value, vFppip)
 GO(gtk_tree_model_iter_children, iFppp)
@@ -3495,7 +3495,7 @@ GO(gtk_tree_model_sort_convert_child_iter_to_iter, iFppp)
 GO(gtk_tree_model_sort_convert_iter_to_child_iter, vFppp)
 GO(gtk_tree_model_sort_convert_path_to_child_path, pFpp)
 GO(gtk_tree_model_sort_get_model, pFp)
-GO(gtk_tree_model_sort_get_type, pFv)
+GO(gtk_tree_model_sort_get_type, LFv)
 GO(gtk_tree_model_sort_iter_is_valid, iFpp)
 GO(gtk_tree_model_sort_new_with_model, pFp)
 //GO(gtk_tree_model_sort_reset_default_sort_func, 
@@ -3509,7 +3509,7 @@ GO(gtk_tree_path_free, vFp)
 GO(gtk_tree_path_get_depth, iFp)
 GO(gtk_tree_path_get_indices, pFp)
 GO(gtk_tree_path_get_indices_with_depth, pFpp)
-GO(gtk_tree_path_get_type, pFv)
+GO(gtk_tree_path_get_type, LFv)
 GO(gtk_tree_path_is_ancestor, iFpp)
 GO(gtk_tree_path_is_descendant, iFpp)
 GO(gtk_tree_path_new, pFv)
@@ -3529,7 +3529,7 @@ GO(gtk_tree_row_reference_deleted, vFpp)
 GO(gtk_tree_row_reference_free, vFp)
 GO(gtk_tree_row_reference_get_model, pFp)
 GO(gtk_tree_row_reference_get_path, pFp)
-GO(gtk_tree_row_reference_get_type, pFv)
+GO(gtk_tree_row_reference_get_type, LFv)
 GO(gtk_tree_row_reference_inserted, vFpp)
 GO(gtk_tree_row_reference_new, pFpp)
 GO(gtk_tree_row_reference_new_proxy, pFppp)
@@ -3542,7 +3542,7 @@ GO(gtk_tree_selection_get_selected, iFppp)
 GO(gtk_tree_selection_get_selected_rows, pFpp)
 //GOM(gtk_tree_selection_get_select_function, BFEp)
 GO(gtk_tree_selection_get_tree_view, pFp)
-GO(gtk_tree_selection_get_type, pFv)
+GO(gtk_tree_selection_get_type, LFv)
 //GOM(gtk_tree_selection_get_user_data, pFEp)
 GO(gtk_tree_selection_iter_is_selected, iFpp)
 GO(gtk_tree_selection_path_is_selected, iFpp)
@@ -3563,7 +3563,7 @@ GO(gtk_tree_set_row_drag_data, iFppp)
 //GO(gtk_tree_set_view_lines, 
 //GO(gtk_tree_set_view_mode, 
 GO(gtk_tree_sortable_get_sort_column_id, iFppp)
-GO(gtk_tree_sortable_get_type, pFv)
+GO(gtk_tree_sortable_get_type, LFv)
 GO(gtk_tree_sortable_has_default_sort_func, iFp)
 GOM(gtk_tree_sortable_set_default_sort_func, vFEpppp)
 GO(gtk_tree_sortable_set_sort_column_id, vFpiu)
@@ -3571,7 +3571,7 @@ GOM(gtk_tree_sortable_set_sort_func, vFEpippp)
 GO(gtk_tree_sortable_sort_column_changed, vFp)
 GO(gtk_tree_store_append, vFppp)
 GO(gtk_tree_store_clear, vFp)
-GO(gtk_tree_store_get_type, pFv)
+GO(gtk_tree_store_get_type, LFv)
 GO(gtk_tree_store_insert, vFpppi)
 GO(gtk_tree_store_insert_after, vFpppp)
 //GO(gtk_tree_store_insert_before, 
@@ -3623,7 +3623,7 @@ GO(gtk_tree_view_column_get_sort_order, uFp)
 GO(gtk_tree_view_column_get_spacing, iFp)
 GO(gtk_tree_view_column_get_title, pFp)
 GO(gtk_tree_view_column_get_tree_view, pFp)
-GO(gtk_tree_view_column_get_type, pFv)
+GO(gtk_tree_view_column_get_type, LFv)
 GO(gtk_tree_view_column_get_visible, iFp)
 GO(gtk_tree_view_column_get_widget, pFp)
 GO(gtk_tree_view_column_get_width, iFp)
@@ -3651,7 +3651,7 @@ GO(gtk_tree_view_column_set_spacing, vFpi)
 GO(gtk_tree_view_column_set_title, vFpp)
 GO(gtk_tree_view_column_set_visible, vFpi)
 GO(gtk_tree_view_column_set_widget, vFpp)
-GO(gtk_tree_view_column_sizing_get_type, pFv)
+GO(gtk_tree_view_column_sizing_get_type, LFv)
 GO(gtk_tree_view_convert_bin_window_to_tree_coords, vFpiipp)
 GO(gtk_tree_view_convert_bin_window_to_widget_coords, vFpiipp)
 GO(gtk_tree_view_convert_tree_to_bin_window_coords, vFpiipp)
@@ -3659,7 +3659,7 @@ GO(gtk_tree_view_convert_tree_to_widget_coords, vFpiipp)
 GO(gtk_tree_view_convert_widget_to_bin_window_coords, vFpiipp)
 GO(gtk_tree_view_convert_widget_to_tree_coords, vFpiipp)
 GO(gtk_tree_view_create_row_drag_icon, pFpp)
-GO(gtk_tree_view_drop_position_get_type, pFv)
+GO(gtk_tree_view_drop_position_get_type, LFv)
 GO(gtk_tree_view_enable_model_drag_dest, vFppiu)
 GO(gtk_tree_view_enable_model_drag_source, vFpupiu)
 GO(gtk_tree_view_expand_all, vFp)
@@ -3698,17 +3698,17 @@ GO(gtk_tree_view_get_selection, pFp)
 GO(gtk_tree_view_get_show_expanders, iFp)
 GO(gtk_tree_view_get_tooltip_column, iFp)
 GO(gtk_tree_view_get_tooltip_context, iFpppippp)
-GO(gtk_tree_view_get_type, pFv)
+GO(gtk_tree_view_get_type, LFv)
 GO(gtk_tree_view_get_vadjustment, pFp)
 GO(gtk_tree_view_get_visible_range, iFppp)
 GO(gtk_tree_view_get_visible_rect, vFpp)
-GO(gtk_tree_view_grid_lines_get_type, pFv)
+GO(gtk_tree_view_grid_lines_get_type, LFv)
 GO(gtk_tree_view_insert_column, iFppi)
 GO(gtk_tree_view_insert_column_with_attributes, iFpipppppppppppp) //vaarg
 //GOM(gtk_tree_view_insert_column_with_data_func, iFpippBpB)
 GO(gtk_tree_view_is_rubber_banding_active, iFp)
 //GOM(gtk_tree_view_map_expanded_rows, vFEpBp)
-GO(gtk_tree_view_mode_get_type, pFv)
+GO(gtk_tree_view_mode_get_type, LFv)
 GO(gtk_tree_view_move_column_after, vFppp)
 GO(gtk_tree_view_new, pFv)
 GO(gtk_tree_view_new_with_model, pFp)
@@ -3769,47 +3769,47 @@ GO(gtk_ui_manager_get_action, pFpp)
 GO(gtk_ui_manager_get_action_groups, pFp)
 GO(gtk_ui_manager_get_add_tearoffs, iFp)
 GO(gtk_ui_manager_get_toplevels, pFpu)
-GO(gtk_ui_manager_get_type, pFv)
+GO(gtk_ui_manager_get_type, LFv)
 GO(gtk_ui_manager_get_ui, pFp)
 GO(gtk_ui_manager_get_widget, pFpp)
 GO(gtk_ui_manager_insert_action_group, vFppi)
-GO(gtk_ui_manager_item_type_get_type, pFv)
+GO(gtk_ui_manager_item_type_get_type, LFv)
 GO(gtk_ui_manager_new, pFv)
 GO(gtk_ui_manager_new_merge_id, uFp)
 GO(gtk_ui_manager_remove_action_group, vFpp)
 GO(gtk_ui_manager_remove_ui, vFpu)
 GO(gtk_ui_manager_set_add_tearoffs, vFpi)
-GO(gtk_unit_get_type, pFv)
-GO(gtk_update_type_get_type, pFv)
-GO(gtk_vbox_get_type, pFv)
+GO(gtk_unit_get_type, LFv)
+GO(gtk_update_type_get_type, LFv)
+GO(gtk_vbox_get_type, LFv)
 GO(gtk_vbox_new, pFii)
 //GO(gtk_vbutton_box_get_layout_default, 
 //GO(gtk_vbutton_box_get_spacing_default, 
-GO(gtk_vbutton_box_get_type, pFv)
+GO(gtk_vbutton_box_get_type, LFv)
 //GO(gtk_vbutton_box_new, 
 //GO(gtk_vbutton_box_set_layout_default, 
 //GO(gtk_vbutton_box_set_spacing_default, 
 //GO(gtk_viewport_get_bin_window, 
 //GO(gtk_viewport_get_hadjustment, 
 GO(gtk_viewport_get_shadow_type, uFp)
-GO(gtk_viewport_get_type, pFv)
+GO(gtk_viewport_get_type, LFv)
 GO(gtk_viewport_get_vadjustment, pFp)
 GO(gtk_viewport_get_view_window, pFp)
 GO(gtk_viewport_new, pFpp)
 //GO(gtk_viewport_set_hadjustment, 
 GO(gtk_viewport_set_shadow_type, vFpu)
 GO(gtk_viewport_set_vadjustment, vFpp)
-GO(gtk_visibility_get_type, pFv)
-GO(gtk_volume_button_get_type, pFv)
+GO(gtk_visibility_get_type, LFv)
+GO(gtk_volume_button_get_type, LFv)
 GO(gtk_volume_button_new, pFv)
-GO(gtk_vpaned_get_type, pFv)
+GO(gtk_vpaned_get_type, LFv)
 GO(gtk_vpaned_new, pFv)
-GO(gtk_vruler_get_type, pFv)
+GO(gtk_vruler_get_type, LFv)
 GO(gtk_vruler_new, pFv)
-GO(gtk_vscale_get_type, pFv)
+GO(gtk_vscale_get_type, LFv)
 GO(gtk_vscale_new, pFp)
 GO(gtk_vscale_new_with_range, pFddd)
-GO(gtk_vscrollbar_get_type, pFv)
+GO(gtk_vscrollbar_get_type, LFv)
 GO(gtk_vscrollbar_new, pFp)
 GO(gtk_vseparator_get_type, LFv)
 GO(gtk_vseparator_new, pFv)
@@ -3840,7 +3840,7 @@ GO(gtk_widget_draw, vFpp)
 GO(gtk_widget_ensure_style, vFp)
 GO(gtk_widget_error_bell, vFp)
 GO(gtk_widget_event, iFpp)
-GO(gtk_widget_flags_get_type, pFv)
+GO(gtk_widget_flags_get_type, LFv)
 GO(gtk_widget_freeze_child_notify, vFp)
 GO(gtk_widget_get_accessible, pFp)
 GO(gtk_widget_get_action, pFp)
@@ -3911,7 +3911,7 @@ GO(gtk_widget_get_tooltip_markup, pFp)
 GO(gtk_widget_get_tooltip_text, pFp)
 GO(gtk_widget_get_tooltip_window, pFp)
 GO(gtk_widget_get_toplevel, pFp)
-GO(gtk_widget_get_type, pFv)
+GO(gtk_widget_get_type, LFv)
 GO(gtk_widget_get_valign, iFp)
 GO(gtk_widget_get_valign_with_baseline, uFp)
 GO(gtk_widget_get_vexpand, iFp)
@@ -3926,7 +3926,7 @@ GO(gtk_widget_has_focus, iFp)
 GO(gtk_widget_has_grab, iFp)
 GO(gtk_widget_has_rc_style, iFp)
 GO(gtk_widget_has_screen, iFp)
-GO(gtk_widget_help_type_get_type, pFv)
+GO(gtk_widget_help_type_get_type, LFv)
 GO(gtk_widget_hide, vFp)
 GO(gtk_widget_hide_all, vFp)
 GO(gtk_widget_hide_on_delete, iFp)
@@ -4127,13 +4127,13 @@ GO(gtk_window_get_skip_pager_hint, iFp)
 GO(gtk_window_get_skip_taskbar_hint, iFp)
 GO(gtk_window_get_title, pFp)
 GO(gtk_window_get_transient_for, pFp)
-GO(gtk_window_get_type, pFv)
+GO(gtk_window_get_type, LFv)
 GO(gtk_window_get_type_hint, uFp)
 GO(gtk_window_get_urgency_hint, iFp)
 GO(gtk_window_get_window_type, uFp)
 GO(gtk_window_group_add_window, vFpp)
 GO(gtk_window_group_get_current_grab, pFp)
-GO(gtk_window_group_get_type, pFv)
+GO(gtk_window_group_get_type, LFv)
 GO(gtk_window_group_list_windows, pFp)
 GO(gtk_window_group_new, pFv)
 GO(gtk_window_group_remove_window, vFpp)
@@ -4147,7 +4147,7 @@ GO(gtk_window_mnemonic_activate, iFpuu)
 GO(gtk_window_move, vFpii)
 GO(gtk_window_new, pFu)
 GO(gtk_window_parse_geometry, iFpp)
-GO(gtk_window_position_get_type, pFv)
+GO(gtk_window_position_get_type, LFv)
 GO(gtk_window_present, vFp)
 GO(gtk_window_present_with_time, vFpu)
 GO(gtk_window_propagate_key_event, iFpp)
@@ -4200,11 +4200,11 @@ GO(gtk_window_set_urgency_hint, vFpi)
 GO(gtk_widget_set_visual, vFpp)
 GO(gtk_window_set_wmclass, vFppp)
 GO(gtk_window_stick, vFp)
-GO(gtk_window_type_get_type, pFv)
+GO(gtk_window_type_get_type, LFv)
 GO(gtk_window_unfullscreen, vFp)
 GO(gtk_window_unmaximize, vFp)
 GO(gtk_window_unstick, vFp)
-GO(gtk_wrap_mode_get_type, pFv)
+GO(gtk_wrap_mode_get_type, LFv)
 GO(gtk_gesture_long_press_get_type, LFv)
 GO(gtk_gesture_single_get_type, LFv)
 GO(gtk_gesture_get_type, LFv)
@@ -4215,3 +4215,5 @@ GO(gtk_stack_set_visible_child_name, vFpp)
 GO(gtk_stack_get_visible_child_name, pFp)
 
 GO(dummy_iFppdd, iFppdd)    // for GtkEventController wrapping
+GO(dummy_iFppUup, iFppUup)
+GO(dummy_pFpLi, pFpLi)
\ No newline at end of file