Added wrapped gtk3 and gdk3 (from box86)

17 files changed, 6822 insertions, 475 deletions

diff --git a/src/include/gtkclass.h b/src/include/gtkclass.h
index 37eab17e..eb931ebf 100755
--- a/src/include/gtkclass.h
+++ b/src/include/gtkclass.h
@@ -39,6 +39,21 @@ typedef struct my_GObjectClass_s
   void*  pdummy[6];
 } my_GObjectClass_t;
 
+typedef struct my_GInitiallyUnownedClass_s
+{
+  int   g_type_class;
+  void* construct_properties;
+  void* (*constructor)     (int type, uint32_t n_construct_properties, void* construct_properties);
+  void  (*set_property)    (void* object, uint32_t property_id, void* value, void* pspec);
+  void  (*get_property)    (void* object, uint32_t property_id, void* value, void* pspec);
+  void  (*dispose)         (void* object);
+  void  (*finalize)        (void* object);
+  void  (*dispatch_properties_changed) (void* object, uint32_t n_pspecs, void* pspecs);
+  void  (*notify)          (void* object, void* pspec);
+  void  (*constructed)     (void* object);
+  uint32_t flags;
+  void*  pdummy[6];
+} my_GInitiallyUnownedClass_t;
 
 typedef struct my_GtkObjectClass_s
 {
@@ -48,7 +63,7 @@ typedef struct my_GtkObjectClass_s
   void (*destroy) (void* object);
 } my_GtkObjectClass_t;
 
-typedef struct my_GtkWidgetClass_s
+typedef struct my_GtkWidget2Class_s
 {
   my_GtkObjectClass_t parent_class;
   uint32_t activate_signal;
@@ -122,11 +137,102 @@ typedef struct my_GtkWidgetClass_s
   void (*_gtk_reserved5) (void);
   void (*_gtk_reserved6) (void);
   void (*_gtk_reserved7) (void);
-} my_GtkWidgetClass_t;
+} my_GtkWidget2Class_t;
+
+typedef struct my_GtkWidget3Class_s
+{
+  my_GInitiallyUnownedClass_t parent_class;
+  uint32_t activate_signal;
+  void (*dispatch_child_properties_changed) (void* widget, uint32_t n_pspecs, void* pspecs);
+  void (* destroy)             (void* widget);
+  void (* show)                (void* widget);
+  void (* show_all)            (void* widget);
+  void (* hide)                (void* widget);
+  void (* map)                 (void* widget);
+  void (* unmap)               (void* widget);
+  void (* realize)             (void* widget);
+  void (* unrealize)           (void* widget);
+  void (* size_allocate)       (void* widget, void* allocation);
+  void (* state_changed)       (void* widget, int previous_state);
+  void (* state_flags_changed) (void* widget, int previous_state_flags);
+  void (* parent_set)          (void* widget, void* previous_parent);
+  void (* hierarchy_changed)   (void* widget, void* previous_toplevel);
+  void (* style_set)           (void* widget, void* previous_style);
+  void (* direction_changed)   (void* widget, int previous_direction);
+  void (* grab_notify)         (void* widget, int was_grabbed);
+  void (* child_notify)        (void* widget, void* child_property);
+  int (* draw)                 (void* widget, void* cr);
+  int (* get_request_mode)     (void* widget);
+  void (* get_preferred_height) (void* widget, void* minimum_height, void* natural_height);
+  void (* get_preferred_width_for_height) (void* widget, int height, void* minimum_width, void* natural_width);
+  void (* get_preferred_width) (void* widget, void* minimum_width, void* natural_width);
+  void (* get_preferred_height_for_width) (void* widget, int width, void* minimum_height, void* natural_height);
+  int (* mnemonic_activate)    (void* widget, int group_cycling);
+  void (* grab_focus)          (void* widget);
+  int (* focus)                (void* widget, int direction);
+  void (* move_focus)          (void* widget, int direction);
+  int (* keynav_failed)        (void* widget, int direction);
+  int (* event)                (void* widget, void* event);
+  int (* button_press_event)   (void* widget, void* event);
+  int (* button_release_event) (void* widget, void* event);
+  int (* scroll_event)         (void* widget, void* event);
+  int (* motion_notify_event)  (void* widget, void* event);
+  int (* delete_event)         (void* widget, void* event);
+  int (* destroy_event)        (void* widget, void* event);
+  int (* key_press_event)      (void* widget, void* event);
+  int (* key_release_event)    (void* widget, void* event);
+  int (* enter_notify_event)   (void* widget, void* event);
+  int (* leave_notify_event)   (void* widget, void* event);
+  int (* configure_event)      (void* widget, void* event);
+  int (* focus_in_event)       (void* widget, void* event);
+  int (* focus_out_event)      (void* widget, void* event);
+  int (* map_event)            (void* widget, void* event);
+  int (* unmap_event)          (void* widget, void* event);
+  int (* property_notify_event) (void* widget, void* event);
+  int (* selection_clear_event) (void* widget, void* event);
+  int (* selection_request_event) (void* widget, void* event);
+  int (* selection_notify_event) (void* widget, void* event);
+  int (* proximity_in_event)   (void* widget, void* event);
+  int (* proximity_out_event)  (void* widget, void* event);
+  int (* visibility_notify_event) (void* widget, void* event);
+  int (* window_state_event)   (void* widget, void* event);
+  int (* damage_event)         (void* widget, void* event);
+  int (* grab_broken_event)    (void* widget, void* event);
+  void (* selection_get)       (void* widget, void* selection_data, uint32_t info, uint32_t time_);
+  void (* selection_received)  (void* widget, void* selection_data, uint32_t time_);
+  void (* drag_begin)          (void* widget, void* context);
+  void (* drag_end)            (void* widget, void* context);
+  void (* drag_data_get)       (void* widget, void* context, void* selection_data, uint32_t info, uint32_t time_);
+  void (* drag_data_delete)    (void* widget, void* context);
+  void (* drag_leave)          (void* widget, void* context, uint32_t time_);
+  int (* drag_motion)          (void* widget, void* context, int x, int y, uint32_t time_);
+  int (* drag_drop)            (void* widget, void* context, int x, int y, uint32_t time_);
+  void (* drag_data_received)  (void* widget, void* context, int x, int y, void* selection_data, uint32_t info, uint32_t time_);
+  int (* drag_failed)          (void* widget, void* context, int result);
+  int (* popup_menu)           (void* widget);
+  int (* show_help)            (void* widget, int help_type);
+  void* (* get_accessible)     (void *widget);
+  void (* screen_changed)      (void* widget, void* previous_screen);
+  int (* can_activate_accel)   (void* widget, uint32_t signal_id);
+  void (* composited_changed)  (void* widget);
+  int (* query_tooltip)        (void* widget, int x, int y, int keyboard_tooltip, void* tooltip);
+  void (* compute_expand)      (void* widget, void*hexpand_p, void* vexpand_p);
+  void (* adjust_size_request) (void* widget, int orientation, void* minimum_size, void* natural_size);
+  void (* adjust_size_allocation) (void*widget, int orientation, void* minimum_size, void* natural_size, void* allocated_pos, void* allocated_size);
+  void (* style_updated)       (void* widget);
+  int (* touch_event)          (void* widget, void* event);
+  void (* get_preferred_height_and_baseline_for_width) (void* widget, int width, void* minimum_height, void* natural_height, void* minimum_baseline, void* natural_baseline);
+  void (* adjust_baseline_request) (void* widget, void* minimum_baseline, void* natural_baseline);
+  void (* adjust_baseline_allocation) (void* widget, void* baseline);
+  void (*queue_draw_region)    (void* widget, void* region);
+  void* priv;
+  void (*_gtk_reserved6) (void);
+  void (*_gtk_reserved7) (void);
+} my_GtkWidget3Class_t;
 
-typedef struct my_GtkContainerClass_s 
+typedef struct my_GtkContainer2Class_s 
 {
-  my_GtkWidgetClass_t parent_class;
+  my_GtkWidget2Class_t parent_class;
   void    (*add)                (void* container, void* widget);
   void    (*remove)             (void* container, void* widget);
   void    (*check_resize)       (void* container);
@@ -140,7 +246,7 @@ typedef struct my_GtkContainerClass_s
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-} my_GtkContainerClass_t;
+} my_GtkContainer2Class_t;
 
 typedef struct my_GtkActionClass_s
 {
@@ -158,14 +264,14 @@ typedef struct my_GtkActionClass_s
   void (*_gtk_reserved4) (void);
 } my_GtkActionClass_t;
 
-typedef struct my_GtkMiscClass_s
+typedef struct my_GtkMisc2Class_s
 {
-  my_GtkWidgetClass_t parent_class;
-} my_GtkMiscClass_t;
+  my_GtkWidget2Class_t parent_class;
+} my_GtkMisc2Class_t;
 
-typedef struct my_GtkLabelClass_s
+typedef struct my_GtkLabel2Class_s
 {
-  my_GtkMiscClass_t parent_class;
+  my_GtkMisc2Class_t parent_class;
   void (* move_cursor)     (void* label, int step, int count, int extend_selection);
   void (* copy_clipboard)  (void* label);
   void (* populate_popup)  (void* label, void* menu);
@@ -173,11 +279,11 @@ typedef struct my_GtkLabelClass_s
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
-} my_GtkLabelClass_t;
+} my_GtkLabel2Class_t;
 
-typedef struct my_GtkTreeViewClass_s
+typedef struct my_GtkTreeView2Class_s
 {
-  my_GtkContainerClass_t parent_class;
+  my_GtkContainer2Class_t parent_class;
   void (* set_scroll_adjustments)     (void* tree_view, void* hadjustment, void* vadjustment);
   void (* row_activated)              (void* tree_view, void* path, void* column);
   int  (* test_expand_row)            (void* tree_view, void* iter, void* path);
@@ -199,19 +305,19 @@ typedef struct my_GtkTreeViewClass_s
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-} my_GtkTreeViewClass_t;
+} my_GtkTreeView2Class_t;
 
-typedef struct my_GtkBinClass_s
+typedef struct my_GtkBin2Class_s
 {
-  my_GtkContainerClass_t parent_class;
+  my_GtkContainer2Class_t parent_class;
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-} my_GtkBinClass_t;
+} my_GtkBin2Class_t;
 
-typedef struct my_GtkWindowClass_s {
-  my_GtkBinClass_t parent_class;
+typedef struct my_GtkWindow2Class_s {
+  my_GtkBin2Class_t parent_class;
   void (* set_focus)    (void* window, void* focus);
   int  (* frame_event)  (void* window, void* event);
   void (* activate_focus)          (void* window);
@@ -222,10 +328,10 @@ typedef struct my_GtkWindowClass_s {
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-} my_GtkWindowClass_t;
+} my_GtkWindow2Class_t;
 
-typedef struct my_GtkButtonClass_s {
-  my_GtkBinClass_t parent_class;
+typedef struct my_GtkButton2Class_s {
+  my_GtkBin2Class_t parent_class;
   void (* pressed)  (void *button);
   void (* released) (void *button);
   void (* clicked)  (void *button);
@@ -236,37 +342,37 @@ typedef struct my_GtkButtonClass_s {
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-} my_GtkButtonClass_t;
+} my_GtkButton2Class_t;
 
-typedef struct my_GtkToggleButtonClass_s {
-  my_GtkButtonClass_t parent_class;
+typedef struct my_GtkToggleButton2Class_s {
+  my_GtkButton2Class_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_GtkToggleButtonClass_t;
+} my_GtkToggleButton2Class_t;
 
-typedef struct my_GtkCheckButtonClass_s {
-  my_GtkToggleButtonClass_t parent_class;
+typedef struct my_GtkCheckButton2Class_s {
+  my_GtkToggleButton2Class_t parent_class;
   void (* draw_indicator) (void* check_button, void* area);
   void (*_gtk_reserved0) (void);
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
-} my_GtkCheckButtonClass_t;
+} my_GtkCheckButton2Class_t;
 
-typedef struct my_GtkComboBoxClass_s {
-  my_GtkBinClass_t parent_class;
+typedef struct my_GtkComboBox2Class_s {
+  my_GtkBin2Class_t parent_class;
   void (* changed)        (void* combo_box);
   void*(* get_active_text)(void* combo_box);
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-} my_GtkComboBoxClass_t;
+} my_GtkComboBox2Class_t;
 
-typedef struct my_GtkEntryClass_s {
-  my_GtkWidgetClass_t parent_class;
+typedef struct my_GtkEntry2Class_s {
+  my_GtkWidget2Class_t parent_class;
   void (* populate_popup)   (void* entry, void* menu);
   void (* activate)           (void* entry);
   void (* move_cursor)        (void* entry, int step, int count, int extend_selection);
@@ -280,10 +386,10 @@ typedef struct my_GtkEntryClass_s {
   void (* get_text_area_size) (void* entry, void* x, void* y, void* width, void* height);
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
-} my_GtkEntryClass_t;
+} my_GtkEntry2Class_t;
 
-typedef struct my_GtkSpinButtonClass_s {
-  my_GtkEntryClass_t parent_class;
+typedef struct my_GtkSpinButton2Class_s {
+  my_GtkEntry2Class_t parent_class;
   int  (*input)  (void* spin_button, void* new_value);
   int  (*output) (void* spin_button);
   void (*value_changed) (void* spin_button);
@@ -292,10 +398,10 @@ typedef struct my_GtkSpinButtonClass_s {
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
-} my_GtkSpinButtonClass_t;
+} my_GtkSpinButton2Class_t;
 
-typedef struct my_GtkProgressClass_s {
-  my_GtkWidgetClass_t parent_class;
+typedef struct my_GtkProgress2Class_s {
+  my_GtkWidget2Class_t parent_class;
   void (* paint)            (void* progress);
   void (* update)           (void* progress);
   void (* act_mode_enter)   (void* progress);
@@ -303,23 +409,23 @@ typedef struct my_GtkProgressClass_s {
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-} my_GtkProgressClass_t;
+} my_GtkProgress2Class_t;
 
-typedef struct my_GtkProgressBarClass_s {
-  my_GtkProgressClass_t parent_class;
+typedef struct my_GtkProgressBar2Class_s {
+  my_GtkProgress2Class_t parent_class;
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-} my_GtkProgressBarClass_t;
+} my_GtkProgressBar2Class_t;
 
-typedef struct my_GtkFrameClass_s {
-  my_GtkBinClass_t parent_class;
+typedef struct my_GtkFrame2Class_s {
+  my_GtkBin2Class_t parent_class;
   void (*compute_child_allocation) (void* frame, void* allocation);
-} my_GtkFrameClass_t;
+} my_GtkFrame2Class_t;
 
-typedef struct my_GtkMenuShellClass_s {
-  my_GtkContainerClass_t parent_class;
+typedef struct my_GtkMenuShell2Class_s {
+  my_GtkContainer2Class_t parent_class;
   void (*deactivate)       (void* menu_shell);
   void (*selection_done)   (void* menu_shell);
   void (*move_current)     (void* menu_shell, int direction);
@@ -331,31 +437,39 @@ typedef struct my_GtkMenuShellClass_s {
   int  (*move_selected)    (void* menu_shell, int distance);
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
-} my_GtkMenuShellClass_t;
+} my_GtkMenuShell2Class_t;
 
-typedef struct my_GtkMenuBarClass_s {
-  my_GtkMenuShellClass_t parent_class;
+typedef struct my_GtkMenuBar2Class_s {
+  my_GtkMenuShell2Class_t parent_class;
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
   void (*_gtk_reserved4) (void);
-} my_GtkMenuBarClass_t;
+} my_GtkMenuBar2Class_t;
 
-typedef struct my_MetaFramesClass_s
+typedef struct my_MetaFrames2Class_s
 {
-  my_GtkWindowClass_t parent_class;
+  my_GtkWindow2Class_t parent_class;
+
+} my_MetaFrames2Class_t;
 
-} my_MetaFramesClass_t;
+typedef struct my_GtkTable2Class_s
+{
+  my_GtkContainer2Class_t parent_class;
+} my_GtkTable2Class_t;
 
-typedef struct my_GtkTableClass_s
+typedef struct my_GtkFixed2Class_s
 {
-  my_GtkContainerClass_t parent_class;
-} my_GtkTableClass_t;
+  my_GtkContainer2Class_t parent_class;
+} my_GtkFixed2Class_t;
 
-typedef struct my_GtkFixedClass_s
+typedef struct my_GDBusObjectManagerClientClass_s
 {
-  my_GtkContainerClass_t parent_class;
-} my_GtkFixedClass_t;
+  my_GObjectClass_t parent_class;
+  void    (*interface_proxy_signal)             (void* manager, void* object_proxy, void* interface_proxy, void* sender_name, void* signal_name, void* parameters);
+  void    (*interface_proxy_properties_changed) (void* manager, void* object_proxy, void* interface_proxy, void* changed_properties, void* invalidated_properties);
+  void* padding[8];
+} my_GDBusObjectManagerClientClass_t;
 
 // GTypeValueTable
 typedef struct my_GTypeValueTable_s {
@@ -411,31 +525,34 @@ my_GtkTypeInfo_t* findFreeGtkTypeInfo(my_GtkTypeInfo_t* fcts, size_t parent);
 void InitGTKClass(bridge_t *bridge);
 void FiniGTKClass();
 
-#define GTKCLASSES()    \
-GTKCLASS(GObject)       \
-GTKCLASS(GtkObject)     \
-GTKCLASS(GtkWidget)     \
-GTKCLASS(GtkContainer)  \
-GTKCLASS(GtkAction)     \
-GTKCLASS(GtkLabel)      \
-GTKCLASS(GtkMisc)       \
-GTKCLASS(GtkTreeView)   \
-GTKCLASS(GtkBin)        \
-GTKCLASS(GtkWindow)     \
-GTKCLASS(GtkTable)      \
-GTKCLASS(GtkFixed)      \
-GTKCLASS(GtkButton)     \
-GTKCLASS(GtkComboBox)   \
-GTKCLASS(GtkToggleButton)\
-GTKCLASS(GtkCheckButton)\
-GTKCLASS(GtkEntry)      \
-GTKCLASS(GtkSpinButton) \
-GTKCLASS(GtkProgress)   \
-GTKCLASS(GtkProgressBar)\
-GTKCLASS(GtkFrame)      \
-GTKCLASS(GtkMenuShell)  \
-GTKCLASS(GtkMenuBar)    \
-GTKCLASS(MetaFrames)    \
+#define GTKCLASSES()                \
+GTKCLASS(GObject)                   \
+GTKCLASS(GInitiallyUnowned)         \
+GTKCLASS(GtkObject)                 \
+GTKCLASS(GtkWidget2)                \
+GTKCLASS(GtkWidget3)                \
+GTKCLASS(GtkContainer2)             \
+GTKCLASS(GtkAction)                 \
+GTKCLASS(GtkLabel2)                 \
+GTKCLASS(GtkMisc2)                  \
+GTKCLASS(GtkTreeView2)              \
+GTKCLASS(GtkBin2)                   \
+GTKCLASS(GtkWindow2)                \
+GTKCLASS(GtkTable2)                 \
+GTKCLASS(GtkFixed2)                 \
+GTKCLASS(GtkButton2)                \
+GTKCLASS(GtkComboBox2)              \
+GTKCLASS(GtkToggleButton2)          \
+GTKCLASS(GtkCheckButton2)           \
+GTKCLASS(GtkEntry2)                 \
+GTKCLASS(GtkSpinButton2)            \
+GTKCLASS(GtkProgress2)              \
+GTKCLASS(GtkProgressBar2)           \
+GTKCLASS(GtkFrame2)                 \
+GTKCLASS(GtkMenuShell2)             \
+GTKCLASS(GtkMenuBar2)               \
+GTKCLASS(MetaFrames2)               \
+GTKCLASS(GDBusObjectManagerClient)  \
 
 #define GTKCLASS(A) void Set##A##ID(size_t id);
 GTKCLASSES()
diff --git a/src/library_list.h b/src/library_list.h
index 7777c2b5..cfcd3c18 100755
--- a/src/library_list.h
+++ b/src/library_list.h
@@ -104,8 +104,8 @@ GO("libpulse.so.0", pulse)
 GO("libsndfile.so.1", libsndfile)
 GO("libgtk-x11-2.0.so.0", gtkx112)
 GO("libgdk-x11-2.0.so.0", gdkx112)
-//GO("libgtk-3.so.0", gtk3)
-//GO("libgdk-3.so.0", gdk3)
+GO("libgtk-3.so.0", gtk3)
+GO("libgdk-3.so.0", gdk3)
 GO("libgdk_pixbuf-2.0.so.0", gdkpixbuf2)
 GO("libgconf-2.so.4", gconf2)
 GO("libgio-2.0.so.0", gio2)
diff --git a/src/tools/gtkclass.c b/src/tools/gtkclass.c
index c3ee1ed4..20d2154e 100755
--- a/src/tools/gtkclass.c
+++ b/src/tools/gtkclass.c
@@ -17,6 +17,8 @@
 #include "custommem.h"
 #include "khash.h"
 
+int is_gtk3 = 0;
+
 static bridge_t*        my_bridge           = NULL;
 static const char* (*g_type_name)(size_t)   = NULL;
 #define GTKCLASS(A) static size_t my_##A    = (size_t)-1;
@@ -132,8 +134,8 @@ WRAPPER(GObject, set_property, void, (void* object, uint32_t property_id, void*
 WRAPPER(GObject, get_property, void, (void* object, uint32_t property_id, void* value, void* pspec), 4, object, property_id, value, pspec);
 WRAPPER(GObject, dispose, void, (void* object), 1, object);
 WRAPPER(GObject, finalize, void, (void* object), 1, object);
-WRAPPER(GObject, dispatch_properties_changed, void*, (int type, uint32_t n_pspecs, void* pspecs), 3, type, n_pspecs, pspecs);
-WRAPPER(GObject, notify, void*, (int type, void* pspecs), 2, type, pspecs);
+WRAPPER(GObject, dispatch_properties_changed, void*, (size_t type, uint32_t n_pspecs, void* pspecs), 3, type, n_pspecs, pspecs);
+WRAPPER(GObject, notify, void*, (size_t type, void* pspecs), 2, type, pspecs);
 WRAPPER(GObject, constructed, void, (void* object), 1, object);
 
 #define SUPERGO() \
@@ -142,7 +144,7 @@ WRAPPER(GObject, constructed, void, (void* object), 1, object);
     GO(get_property, vFpupp);               \
     GO(dispose, vFp);                       \
     GO(finalize, vFp);                      \
-    GO(dispatch_properties_changed, vFpup); \
+    GO(dispatch_properties_changed, vFLup); \
     GO(notify, vFpp);                       \
     GO(constructed, vFp);
 
@@ -169,6 +171,50 @@ static void bridgeGObjectClass(my_GObjectClass_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), 3, type, n_construct_properties, construct_properties);
+WRAPPER(GInitiallyUnowned, set_property, void, (void* object, uint32_t property_id, void* value, void* pspec), 4, object, property_id, value, pspec);
+WRAPPER(GInitiallyUnowned, get_property, void, (void* object, uint32_t property_id, void* value, void* pspec), 4, object, property_id, value, pspec);
+WRAPPER(GInitiallyUnowned, dispose, void, (void* object), 1, object);
+WRAPPER(GInitiallyUnowned, finalize, void, (void* object), 1, object);
+WRAPPER(GInitiallyUnowned, dispatch_properties_changed, void*, (size_t type, uint32_t n_pspecs, void* pspecs), 3, type, n_pspecs, pspecs);
+WRAPPER(GInitiallyUnowned, notify, void*, (size_t type, void* pspecs), 2, type, pspecs);
+WRAPPER(GInitiallyUnowned, constructed, void, (void* object), 1, object);
+
+#define SUPERGO() \
+    GO(constructor, pFLup);                 \
+    GO(set_property, vFpupp);               \
+    GO(get_property, vFpupp);               \
+    GO(dispose, vFp);                       \
+    GO(finalize, vFp);                      \
+    GO(dispatch_properties_changed, vFLup); \
+    GO(notify, vFLp);                       \
+    GO(constructed, vFp);
+
+// wrap (so bridge all calls, just in case)
+static void wrapGInitiallyUnownedClass(my_GInitiallyUnownedClass_t* class)
+{
+    #define GO(A, W) class->A = reverse_##A##_GInitiallyUnowned (W, class->A)
+    SUPERGO()
+    #undef GO
+}
+// unwrap (and use callback if not a native call anymore)
+static void unwrapGInitiallyUnownedClass(my_GInitiallyUnownedClass_t* class)
+{   
+    #define GO(A, W)   class->A = find_##A##_GInitiallyUnowned (class->A)
+    SUPERGO()
+    #undef GO
+}
+// autobridge
+static void bridgeGInitiallyUnownedClass(my_GInitiallyUnownedClass_t* class)
+{
+    #define GO(A, W) autobridge_##A##_GInitiallyUnowned (W, class->A)
+    SUPERGO()
+    #undef GO
+}
+#undef SUPERGO
+
 // ----- GtkObjectClass ------
 // wrapper x64 -> natives of callbacks
 WRAPPER(GtkObject, set_arg, void, (void* object, void* arg, uint32_t arg_id), 3, object, arg, arg_id);
@@ -206,74 +252,74 @@ static void bridgeGtkObjectClass(my_GtkObjectClass_t* class)
 
 #undef SUPERGO
 
-// ----- GtkWidgetClass ------
-// wrapper x64 -> natives of callbacks
-WRAPPER(GtkWidget, dispatch_child_properties_changed, void, (void* widget, uint32_t n_pspecs, void* pspecs), 3, widget, n_pspecs, pspecs);
-WRAPPER(GtkWidget, show,              void, (void* widget), 1, widget);
-WRAPPER(GtkWidget, show_all,          void, (void* widget), 1, widget);
-WRAPPER(GtkWidget, hide,              void, (void* widget), 1, widget);
-WRAPPER(GtkWidget, hide_all,          void, (void* widget), 1, widget);
-WRAPPER(GtkWidget, map,               void, (void* widget), 1, widget);
-WRAPPER(GtkWidget, unmap,             void, (void* widget), 1, widget);
-WRAPPER(GtkWidget, realize,           void, (void* widget), 1, widget);
-WRAPPER(GtkWidget, unrealize,         void, (void* widget), 1, widget);
-WRAPPER(GtkWidget, size_request,      void, (void* widget, void* requisition), 2, widget, requisition);
-WRAPPER(GtkWidget, size_allocate,     void, (void* widget, void* allocation), 2, widget, allocation);
-WRAPPER(GtkWidget, state_changed,     void, (void* widget, int previous_state), 2, widget, previous_state);
-WRAPPER(GtkWidget, parent_set,        void, (void* widget, void* previous_parent), 2, widget, previous_parent);
-WRAPPER(GtkWidget, hierarchy_changed, void, (void* widget, void* previous_toplevel), 2, widget, previous_toplevel);
-WRAPPER(GtkWidget, style_set,         void, (void* widget, void* previous_style), 2, widget, previous_style);
-WRAPPER(GtkWidget, direction_changed, void, (void* widget, int previous_direction), 2, widget, previous_direction);
-WRAPPER(GtkWidget, grab_notify,       void, (void* widget, int was_grabbed), 2, widget, was_grabbed);
-WRAPPER(GtkWidget, child_notify,      void, (void* widget, void* pspec), 2, widget, pspec);
-WRAPPER(GtkWidget, mnemonic_activate, int, (void* widget, int group_cycling), 2, widget, group_cycling);
-WRAPPER(GtkWidget, grab_focus,        void, (void* widget), 1, widget);
-WRAPPER(GtkWidget, focus,             int, (void* widget, int direction), 2, widget, direction);
-WRAPPER(GtkWidget, event,             int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, button_press_event,int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, button_release_event, int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, scroll_event,      int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, motion_notify_event, int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, delete_event,       int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, destroy_event,      int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, expose_event,       int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, key_press_event,    int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, key_release_event,  int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, enter_notify_event, int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, leave_notify_event, int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, configure_event,    int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, focus_in_event,     int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, focus_out_event,    int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, map_event,          int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, unmap_event,        int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, property_notify_event,  int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, selection_clear_event,  int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, selection_request_event,int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, selection_notify_event, int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, proximity_in_event,  int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, proximity_out_event, int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, visibility_notify_event, int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, client_event,        int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, no_expose_event,     int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, window_state_event,  int, (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget, selection_get,       void, (void* widget, void* selection_data, uint32_t info, uint32_t time_), 4, widget, selection_data, info, time_);
-WRAPPER(GtkWidget, selection_received,  void, (void* widget, void* selection_data, uint32_t time_), 3, widget, selection_data, time_);
-WRAPPER(GtkWidget, drag_begin,          void, (void* widget, void* context), 2, widget, context);
-WRAPPER(GtkWidget, drag_end,            void, (void* widget, void* context), 2, widget, context);
-WRAPPER(GtkWidget, drag_data_get,       void, (void* widget, void* context, void* selection_data, uint32_t info, uint32_t time_), 5, widget, context, selection_data, info, time_);
-WRAPPER(GtkWidget, drag_data_delete,    void, (void* widget, void* context), 2, widget, context);
-WRAPPER(GtkWidget, drag_leave,          void, (void* widget, void* context, uint32_t time_), 3, widget, context, time_);
-WRAPPER(GtkWidget, drag_motion,         int, (void* widget, void* context, int32_t x, int32_t y, uint32_t time_), 5, widget, context, x, y, time_);
-WRAPPER(GtkWidget, drag_drop,           int, (void* widget, void* context, int32_t x, int32_t y, uint32_t time_), 5, widget, context, x, y, time_);
-WRAPPER(GtkWidget, drag_data_received,  void, (void* widget, void* context, int32_t x, int32_t y, void* selection_data, uint32_t info, uint32_t time_), 7, widget, context, x, y, selection_data, info, time_);
-WRAPPER(GtkWidget,  popup_menu,         int  , (void* widget), 1, widget);
-WRAPPER(GtkWidget,  show_help,          int  , (void* widget, int help_type), 2, widget, help_type);
-WRAPPER(GtkWidget, get_accessible,      void*, (void* widget), 1, widget);
-WRAPPER(GtkWidget, screen_changed,      void , (void* widget, void* previous_screen), 2, widget, previous_screen);
-WRAPPER(GtkWidget, can_activate_accel,  int  , (void* widget, uint32_t signal_id), 2, widget, signal_id);
-WRAPPER(GtkWidget, grab_broken_event,   int  , (void* widget, void* event), 2, widget, event);
-WRAPPER(GtkWidget,  composited_changed, void , (void* widget), 1, widget);
-WRAPPER(GtkWidget,  query_tooltip,      int  , (void* widget, int32_t x, int32_t y, int keyboard_tooltip, void* tooltip), 5, widget, x, y, keyboard_tooltip, tooltip);
+// ----- GtkWidget2Class ------
+// wrapper x86 -> natives of callbacks
+WRAPPER(GtkWidget2, dispatch_child_properties_changed, void, (void* widget, uint32_t n_pspecs, void* pspecs), 3, widget, n_pspecs, pspecs);
+WRAPPER(GtkWidget2, show,              void, (void* widget), 1, widget);
+WRAPPER(GtkWidget2, show_all,          void, (void* widget), 1, widget);
+WRAPPER(GtkWidget2, hide,              void, (void* widget), 1, widget);
+WRAPPER(GtkWidget2, hide_all,          void, (void* widget), 1, widget);
+WRAPPER(GtkWidget2, map,               void, (void* widget), 1, widget);
+WRAPPER(GtkWidget2, unmap,             void, (void* widget), 1, widget);
+WRAPPER(GtkWidget2, realize,           void, (void* widget), 1, widget);
+WRAPPER(GtkWidget2, unrealize,         void, (void* widget), 1, widget);
+WRAPPER(GtkWidget2, size_request,      void, (void* widget, void* requisition), 2, widget, requisition);
+WRAPPER(GtkWidget2, size_allocate,     void, (void* widget, void* allocation), 2, widget, allocation);
+WRAPPER(GtkWidget2, state_changed,     void, (void* widget, int previous_state), 2, widget, previous_state);
+WRAPPER(GtkWidget2, parent_set,        void, (void* widget, void* previous_parent), 2, widget, previous_parent);
+WRAPPER(GtkWidget2, hierarchy_changed, void, (void* widget, void* previous_toplevel), 2, widget, previous_toplevel);
+WRAPPER(GtkWidget2, style_set,         void, (void* widget, void* previous_style), 2, widget, previous_style);
+WRAPPER(GtkWidget2, direction_changed, void, (void* widget, int previous_direction), 2, widget, previous_direction);
+WRAPPER(GtkWidget2, grab_notify,       void, (void* widget, int was_grabbed), 2, widget, was_grabbed);
+WRAPPER(GtkWidget2, child_notify,      void, (void* widget, void* pspec), 2, widget, pspec);
+WRAPPER(GtkWidget2, mnemonic_activate, int, (void* widget, int group_cycling), 2, widget, group_cycling);
+WRAPPER(GtkWidget2, grab_focus,        void, (void* widget), 1, widget);
+WRAPPER(GtkWidget2, focus,             int, (void* widget, int direction), 2, widget, direction);
+WRAPPER(GtkWidget2, event,             int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, button_press_event,int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, button_release_event, int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, scroll_event,      int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, motion_notify_event, int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, delete_event,       int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, destroy_event,      int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, expose_event,       int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, key_press_event,    int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, key_release_event,  int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, enter_notify_event, int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, leave_notify_event, int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, configure_event,    int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, focus_in_event,     int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, focus_out_event,    int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, map_event,          int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, unmap_event,        int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, property_notify_event,  int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, selection_clear_event,  int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, selection_request_event,int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, selection_notify_event, int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, proximity_in_event,  int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, proximity_out_event, int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, visibility_notify_event, int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, client_event,        int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, no_expose_event,     int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, window_state_event,  int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2, selection_get,       void, (void* widget, void* selection_data, uint32_t info, uint32_t time_), 4, widget, selection_data, info, time_);
+WRAPPER(GtkWidget2, selection_received,  void, (void* widget, void* selection_data, uint32_t time_), 3, widget, selection_data, time_);
+WRAPPER(GtkWidget2, drag_begin,          void, (void* widget, void* context), 2, widget, context);
+WRAPPER(GtkWidget2, drag_end,            void, (void* widget, void* context), 2, widget, context);
+WRAPPER(GtkWidget2, drag_data_get,       void, (void* widget, void* context, void* selection_data, uint32_t info, uint32_t time_), 5, widget, context, selection_data, info, time_);
+WRAPPER(GtkWidget2, drag_data_delete,    void, (void* widget, void* context), 2, widget, context);
+WRAPPER(GtkWidget2, drag_leave,          void, (void* widget, void* context, uint32_t time_), 3, widget, context, time_);
+WRAPPER(GtkWidget2, drag_motion,         int, (void* widget, void* context, int32_t x, int32_t y, uint32_t time_), 5, widget, context, x, y, time_);
+WRAPPER(GtkWidget2, drag_drop,           int, (void* widget, void* context, int32_t x, int32_t y, uint32_t time_), 5, widget, context, x, y, time_);
+WRAPPER(GtkWidget2, drag_data_received,  void, (void* widget, void* context, int32_t x, int32_t y, void* selection_data, uint32_t info, uint32_t time_), 7, widget, context, x, y, selection_data, info, time_);
+WRAPPER(GtkWidget2,  popup_menu,         int  , (void* widget), 1, widget);
+WRAPPER(GtkWidget2,  show_help,          int  , (void* widget, int help_type), 2, widget, help_type);
+WRAPPER(GtkWidget2, get_accessible,      void*, (void* widget), 1, widget);
+WRAPPER(GtkWidget2, screen_changed,      void , (void* widget, void* previous_screen), 2, widget, previous_screen);
+WRAPPER(GtkWidget2, can_activate_accel,  int  , (void* widget, uint32_t signal_id), 2, widget, signal_id);
+WRAPPER(GtkWidget2, grab_broken_event,   int  , (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget2,  composited_changed, void , (void* widget), 1, widget);
+WRAPPER(GtkWidget2,  query_tooltip,      int  , (void* widget, int32_t x, int32_t y, int keyboard_tooltip, void* tooltip), 5, widget, x, y, keyboard_tooltip, tooltip);
 
 #define SUPERGO() \
     GO(dispatch_child_properties_changed, vFpup);   \
@@ -344,43 +390,240 @@ WRAPPER(GtkWidget,  query_tooltip,      int  , (void* widget, int32_t x, int32_t
     GO(query_tooltip, iFpiiip);
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkWidgetClass(my_GtkWidgetClass_t* class)
+static void wrapGtkWidget2Class(my_GtkWidget2Class_t* class)
 {
     wrapGtkObjectClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkWidget (W, class->A)
+    #define GO(A, W) class->A = reverse_##A##_GtkWidget2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkWidgetClass(my_GtkWidgetClass_t* class)
+static void unwrapGtkWidget2Class(my_GtkWidget2Class_t* class)
 {   
     unwrapGtkObjectClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkWidget (class->A)
+    #define GO(A, W)   class->A = find_##A##_GtkWidget2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkWidgetClass(my_GtkWidgetClass_t* class)
+static void bridgeGtkWidget2Class(my_GtkWidget2Class_t* class)
 {
     bridgeGtkObjectClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkWidget (W, class->A)
+    #define GO(A, W) autobridge_##A##_GtkWidget2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 
 #undef SUPERGO
 
-// ----- GtkContainerClass ------
-// wrapper x64 -> natives of callbacks
-WRAPPER(GtkContainer, add, void, (void* container, void* widget), 2, container, widget);
-WRAPPER(GtkContainer, remove, void, (void* container, void* widget), 2, container, widget);
-WRAPPER(GtkContainer, check_resize, void, (void* container), 1, container);
-WRAPPER(GtkContainer, forall, void, (void* container, int include_internals, void* callback, void* callback_data), 4, container, include_internals, AddCheckBridge(my_bridge, vFpp, callback, 0, NULL), callback_data);
-WRAPPER(GtkContainer, set_focus_child, void, (void* container, void* widget), 2, container, widget);
-WRAPPER(GtkContainer, child_type, int, (void* container), 1, container);
-WRAPPER(GtkContainer, composite_name, void*, (void* container, void* child), 2, container, child);
-WRAPPER(GtkContainer, set_child_property, void, (void* container, void* child, uint32_t property_id, void* value, void* pspec), 5, container, child, property_id, value, pspec);
-WRAPPER(GtkContainer, get_child_property, void, (void* container, void* child, uint32_t property_id, void* value, void* pspec), 5, container, child, property_id, value, pspec);
+// ----- GtkWidget3Class ------
+// wrapper x86 -> natives of callbacks
+WRAPPER(GtkWidget3, dispatch_child_properties_changed, void, (void* widget, uint32_t n_pspecs, void* pspecs), 3, widget, n_pspecs, pspecs);
+WRAPPER(GtkWidget3, destroy, void,              (void* widget), 1, widget);
+WRAPPER(GtkWidget3, show, void,                 (void* widget), 1, widget);
+WRAPPER(GtkWidget3, show_all, void,             (void* widget), 1, widget);
+WRAPPER(GtkWidget3, hide, void,                 (void* widget), 1, widget);
+WRAPPER(GtkWidget3, map, void,                  (void* widget), 1, widget);
+WRAPPER(GtkWidget3, unmap, void,                (void* widget), 1, widget);
+WRAPPER(GtkWidget3, realize, void,              (void* widget), 1, widget);
+WRAPPER(GtkWidget3, unrealize, void,            (void* widget), 1, widget);
+WRAPPER(GtkWidget3, size_allocate, void,        (void* widget, void* allocation), 2, widget, allocation);
+WRAPPER(GtkWidget3, state_changed, void,        (void* widget, int previous_state), 2, widget, previous_state);
+WRAPPER(GtkWidget3, state_flags_changed, void,  (void* widget, int previous_state_flags), 2, widget, previous_state_flags);
+WRAPPER(GtkWidget3, parent_set, void,           (void* widget, void* previous_parent), 2, widget, previous_parent);
+WRAPPER(GtkWidget3, hierarchy_changed, void,    (void* widget, void* previous_toplevel), 2, widget, previous_toplevel);
+WRAPPER(GtkWidget3, style_set, void,            (void* widget, void* previous_style), 2, widget, previous_style);
+WRAPPER(GtkWidget3, direction_changed, void,    (void* widget, int previous_direction), 2, widget, previous_direction);
+WRAPPER(GtkWidget3, grab_notify, void,          (void* widget, int was_grabbed), 2, widget, was_grabbed);
+WRAPPER(GtkWidget3, child_notify, void,         (void* widget, void* child_property), 2, widget, child_property);
+WRAPPER(GtkWidget3, draw, int,                  (void* widget, void* cr), 2, widget, cr);
+WRAPPER(GtkWidget3, get_request_mode, int,      (void* widget), 1, widget);
+WRAPPER(GtkWidget3, get_preferred_height, void, (void* widget, void* minimum_height, void* natural_height), 3, widget, minimum_height, natural_height);
+WRAPPER(GtkWidget3, get_preferred_width_for_height, void,  (void* widget, int height, void* minimum_width, void* natural_width), 4, widget, height, minimum_width, natural_width);
+WRAPPER(GtkWidget3, get_preferred_width, void,  (void* widget, void* minimum_width, void* natural_width), 3, widget, minimum_width, natural_width);
+WRAPPER(GtkWidget3, get_preferred_height_for_width, void,  (void* widget, int width, void* minimum_height, void* natural_height), 4, widget, width, minimum_height, natural_height);
+WRAPPER(GtkWidget3, mnemonic_activate, int,     (void* widget, int group_cycling), 2, widget, group_cycling);
+WRAPPER(GtkWidget3, grab_focus, void,           (void* widget), 1, widget);
+WRAPPER(GtkWidget3, focus, int,                 (void* widget, int direction), 2, widget, direction);
+WRAPPER(GtkWidget3, move_focus, void,           (void* widget, int direction), 2, widget, direction);
+WRAPPER(GtkWidget3, keynav_failed, int,         (void* widget, int direction), 2, widget, direction);
+WRAPPER(GtkWidget3, event, int,                 (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, button_press_event, int,    (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, button_release_event, int,  (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, scroll_event, int,          (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, motion_notify_event, int,   (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, delete_event, int,          (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, destroy_event, int,         (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, key_press_event, int,       (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, key_release_event, int,     (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, enter_notify_event, int,    (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, leave_notify_event, int,    (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, configure_event, int,       (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, focus_in_event, int,        (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, focus_out_event, int,       (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, map_event, int,             (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, unmap_event, int,           (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, property_notify_event, int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, selection_clear_event, int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, selection_request_event, int, (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, selection_notify_event, int,(void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, proximity_in_event, int,    (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, proximity_out_event, int,   (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, visibility_notify_event, int,   (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, window_state_event, int,    (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, damage_event, int,          (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, grab_broken_event, int,     (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, selection_get, void,        (void* widget, void* selection_data, uint32_t info, uint32_t time_), 4, widget, selection_data, info, time_);
+WRAPPER(GtkWidget3, selection_received, void,   (void* widget, void* selection_data, uint32_t time_), 3, widget, selection_data, time_);
+WRAPPER(GtkWidget3, drag_begin, void,           (void* widget, void* context), 2, widget, context);
+WRAPPER(GtkWidget3, drag_end, void,             (void* widget, void* context), 2, widget, context);
+WRAPPER(GtkWidget3, drag_data_get, void,        (void* widget, void* context, void* selection_data, uint32_t info, uint32_t time_), 5, widget, context, selection_data, info, time_);
+WRAPPER(GtkWidget3, drag_data_delete, void,     (void* widget, void* context), 2, widget, context);
+WRAPPER(GtkWidget3, drag_leave, void,           (void* widget, void* context, uint32_t time_), 3, widget, context, time_);
+WRAPPER(GtkWidget3, drag_motion, int,           (void* widget, void* context, int x, int y, uint32_t time_), 5, widget, context, x, y, time_);
+WRAPPER(GtkWidget3, drag_drop, int,             (void* widget, void* context, int x, int y, uint32_t time_), 5, widget, context, x, y, time_);
+WRAPPER(GtkWidget3, drag_data_received, void,   (void* widget, void* context, int x, int y, void* selection_data, uint32_t info, uint32_t time_), 7, widget, context, x, y, selection_data, info, time_);
+WRAPPER(GtkWidget3, drag_failed, int,           (void* widget, void* context, int result), 3, widget, context, result);
+WRAPPER(GtkWidget3, popup_menu, int,            (void* widget), 1, widget);
+WRAPPER(GtkWidget3, show_help, int,             (void* widget, int help_type), 2, widget, help_type);
+WRAPPER(GtkWidget3, get_accessible, void*,      (void *widget), 1, widget);
+WRAPPER(GtkWidget3, screen_changed, void,       (void* widget, void* previous_screen), 2, widget, previous_screen);
+WRAPPER(GtkWidget3, can_activate_accel, int,    (void* widget, uint32_t signal_id), 2, widget, signal_id);
+WRAPPER(GtkWidget3, composited_changed, void,   (void* widget), 1, widget);
+WRAPPER(GtkWidget3, query_tooltip, int,         (void* widget, int x, int y, int keyboard_tooltip, void* tooltip), 5, widget, x, y, keyboard_tooltip, tooltip);
+WRAPPER(GtkWidget3, compute_expand, void,       (void* widget, void* hexpand_p, void* vexpand_p), 3, widget, hexpand_p, vexpand_p);
+WRAPPER(GtkWidget3, adjust_size_request, void,  (void* widget, int orientation, void* minimum_size, void* natural_size), 4, widget, orientation, minimum_size, natural_size);
+WRAPPER(GtkWidget3, adjust_size_allocation, void, (void*widget, int orientation, void* minimum_size, void* natural_size, void* allocated_pos, void* allocated_size), 6, widget, orientation, minimum_size, natural_size, allocated_pos, allocated_size);
+WRAPPER(GtkWidget3, style_updated, void,        (void* widget), 1, widget);
+WRAPPER(GtkWidget3, touch_event, int,           (void* widget, void* event), 2, widget, event);
+WRAPPER(GtkWidget3, get_preferred_height_and_baseline_for_width, void, (void* widget, int width, void* minimum_height, void* natural_height, void* minimum_baseline, void* natural_baseline), 6, widget, width, minimum_height, natural_height, minimum_baseline, natural_baseline);
+WRAPPER(GtkWidget3, adjust_baseline_request, void,  (void* widget, void* minimum_baseline, void* natural_baseline), 3, widget, minimum_baseline, natural_baseline);
+WRAPPER(GtkWidget3, adjust_baseline_allocation, void,  (void* widget, void* baseline), 2, widget, baseline);
+WRAPPER(GtkWidget3, queue_draw_region, void,    (void* widget, void* region), 2, widget, region);
+
+#define SUPERGO() \
+    GO(dispatch_child_properties_changed, vFpup);   \
+    GO(destroy, vFp);                               \
+    GO(show, vFp);                                  \
+    GO(show_all, vFp);                              \
+    GO(hide, vFp);                                  \
+    GO(map, vFp);                                   \
+    GO(unmap, vFp);                                 \
+    GO(realize, vFp);                               \
+    GO(unrealize, vFp);                             \
+    GO(size_allocate, vFpp);                        \
+    GO(state_changed, vFpi);                        \
+    GO(state_flags_changed, vFpi);                  \
+    GO(parent_set, vFpp);                           \
+    GO(hierarchy_changed, vFpp);                    \
+    GO(style_set, vFpp);                            \
+    GO(direction_changed, vFpi);                    \
+    GO(grab_notify, vFpi);                          \
+    GO(child_notify, vFpp);                         \
+    GO(draw, iFpp);                                 \
+    GO(get_request_mode, iFp);                      \
+    GO(get_preferred_height, vFppp);                \
+    GO(get_preferred_width_for_height, vFpipp);     \
+    GO(get_preferred_width, vFppp);                 \
+    GO(get_preferred_height_for_width, vFpipp);     \
+    GO(mnemonic_activate, iFpi);                    \
+    GO(grab_focus, vFp);                            \
+    GO(focus, iFpi);                                \
+    GO(move_focus, vFpi);                           \
+    GO(keynav_failed, iFpi);                        \
+    GO(event, iFpp);                                \
+    GO(button_press_event, iFpp);                   \
+    GO(button_release_event, iFpp);                 \
+    GO(scroll_event, iFpp);                         \
+    GO(motion_notify_event, iFpp);                  \
+    GO(delete_event, iFpp);                         \
+    GO(destroy_event, iFpp);                        \
+    GO(key_press_event, iFpp);                      \
+    GO(key_release_event, iFpp);                    \
+    GO(enter_notify_event, iFpp);                   \
+    GO(leave_notify_event, iFpp);                   \
+    GO(configure_event, iFpp);                      \
+    GO(focus_in_event, iFpp);                       \
+    GO(focus_out_event, iFpp);                      \
+    GO(map_event, iFpp);                            \
+    GO(unmap_event, iFpp);                          \
+    GO(property_notify_event, iFpp);                \
+    GO(selection_clear_event, iFpp);                \
+    GO(selection_request_event, iFpp);              \
+    GO(selection_notify_event, iFpp);               \
+    GO(proximity_in_event, iFpp);                   \
+    GO(proximity_out_event, iFpp);                  \
+    GO(visibility_notify_event, iFpp);              \
+    GO(window_state_event, iFpp);                   \
+    GO(damage_event, iFpp);                         \
+    GO(grab_broken_event, iFpp);                    \
+    GO(selection_get, vFppuu);                      \
+    GO(selection_received, vFppu);                  \
+    GO(drag_begin, vFpp);                           \
+    GO(drag_end, vFpp);                             \
+    GO(drag_data_get, vFpppuu);                     \
+    GO(drag_data_delete, vFpp);                     \
+    GO(drag_leave, vFppu);                          \
+    GO(drag_motion, iFppiiu);                       \
+    GO(drag_drop, iFppiiu);                         \
+    GO(drag_data_received, vFppiipuu);              \
+    GO(drag_failed, iFppi);                         \
+    GO(popup_menu, iFp);                            \
+    GO(show_help, iFpi);                            \
+    GO(get_accessible, pFp);                        \
+    GO(screen_changed, vFpp);                       \
+    GO(can_activate_accel, iFpu);                   \
+    GO(grab_broken_event, iFpp);                    \
+    GO(composited_changed, vFp);                    \
+    GO(query_tooltip, iFpiiip);                     \
+    GO(compute_expand, vFppp);                      \
+    GO(adjust_size_request, vFpipp);                \
+    GO(adjust_size_allocation, vFpipppp);           \
+    GO(style_updated, vFp);                         \
+    GO(touch_event, iFpp);                          \
+    GO(get_preferred_height_and_baseline_for_width, vFpipppp);\
+    GO(adjust_baseline_request, vFppp);             \
+    GO(adjust_baseline_allocation, vFpp);           \
+    GO(queue_draw_region, vFpp);                    \
+
+// wrap (so bridge all calls, just in case)
+static void wrapGtkWidget3Class(my_GtkWidget3Class_t* class)
+{
+    wrapGInitiallyUnownedClass(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkWidget3 (W, class->A)
+    SUPERGO()
+    #undef GO
+}
+// unwrap (and use callback if not a native call anymore)
+static void unwrapGtkWidget3Class(my_GtkWidget3Class_t* class)
+{   
+    unwrapGInitiallyUnownedClass(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkWidget3 (class->A)
+    SUPERGO()
+    #undef GO
+}
+// autobridge
+static void bridgeGtkWidget3Class(my_GtkWidget3Class_t* class)
+{
+    bridgeGInitiallyUnownedClass(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkWidget3 (W, class->A)
+    SUPERGO()
+    #undef GO
+}
+
+#undef SUPERGO
+
+// ----- GtkContainer2Class ------
+// wrapper x86 -> natives of callbacks
+WRAPPER(GtkContainer2, add, void, (void* container, void* widget), 2, container, widget);
+WRAPPER(GtkContainer2, remove, void, (void* container, void* widget), 2, container, widget);
+WRAPPER(GtkContainer2, check_resize, void, (void* container), 1, container);
+WRAPPER(GtkContainer2, forall, void, (void* container, int include_internals, void* callback, void* callback_data), 4, container, include_internals, AddCheckBridge(my_bridge, vFpp, callback, 0, NULL), callback_data);
+WRAPPER(GtkContainer2, set_focus_child, void, (void* container, void* widget), 2, container, widget);
+WRAPPER(GtkContainer2, child_type, int, (void* container), 1, container);
+WRAPPER(GtkContainer2, composite_name, void*, (void* container, void* child), 2, container, child);
+WRAPPER(GtkContainer2, set_child_property, void, (void* container, void* child, uint32_t property_id, void* value, void* pspec), 5, container, child, property_id, value, pspec);
+WRAPPER(GtkContainer2, get_child_property, void, (void* container, void* child, uint32_t property_id, void* value, void* pspec), 5, container, child, property_id, value, pspec);
 
 #define SUPERGO() \
     GO(add, vFpp);                  \
@@ -394,26 +637,26 @@ WRAPPER(GtkContainer, get_child_property, void, (void* container, void* child, u
     GO(get_child_property, vFppupp);
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkContainerClass(my_GtkContainerClass_t* class)
+static void wrapGtkContainer2Class(my_GtkContainer2Class_t* class)
 {
-    wrapGtkWidgetClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkContainer (W, class->A)
+    wrapGtkWidget2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkContainer2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkContainerClass(my_GtkContainerClass_t* class)
+static void unwrapGtkContainer2Class(my_GtkContainer2Class_t* class)
 {   
-    unwrapGtkWidgetClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkContainer (class->A)
+    unwrapGtkWidget2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkContainer2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkContainerClass(my_GtkContainerClass_t* class)
+static void bridgeGtkContainer2Class(my_GtkContainer2Class_t* class)
 {
-    bridgeGtkWidgetClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkContainer (W, class->A)
+    bridgeGtkWidget2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkContainer2 (W, class->A)
     SUPERGO()
     #undef GO
 }
@@ -421,7 +664,7 @@ static void bridgeGtkContainerClass(my_GtkContainerClass_t* class)
 #undef SUPERGO
 
 // ----- GtkActionClass ------
-// wrapper x64 -> natives of callbacks
+// wrapper x86 -> natives of callbacks
 WRAPPER(GtkAction, activate, void, (void* action), 1, action);
 WRAPPER(GtkAction, create_menu_item, void*, (void* action), 1, action);
 WRAPPER(GtkAction, create_tool_item, void*, (void* action), 1, action);
@@ -463,31 +706,31 @@ static void bridgeGtkActionClass(my_GtkActionClass_t* class)
 }
 #undef SUPERGO
 
-// ----- GtkMiscClass ------
+// ----- GtkMisc2Class ------
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkMiscClass(my_GtkMiscClass_t* class)
+static void wrapGtkMisc2Class(my_GtkMisc2Class_t* class)
 {
-    wrapGtkWidgetClass(&class->parent_class);
+    wrapGtkWidget2Class(&class->parent_class);
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkMiscClass(my_GtkMiscClass_t* class)
+static void unwrapGtkMisc2Class(my_GtkMisc2Class_t* class)
 {   
-    unwrapGtkWidgetClass(&class->parent_class);
+    unwrapGtkWidget2Class(&class->parent_class);
 }
 // autobridge
-static void bridgeGtkMiscClass(my_GtkMiscClass_t* class)
+static void bridgeGtkMisc2Class(my_GtkMisc2Class_t* class)
 {
-    bridgeGtkWidgetClass(&class->parent_class);
+    bridgeGtkWidget2Class(&class->parent_class);
 }
 
 
-// ----- GtkLabelClass ------
-// wrapper x64 -> natives of callbacks
-WRAPPER(GtkMisc, move_cursor, void, (void* label, int step, int count, int extend_selection), 4, label, step, count, extend_selection);
-WRAPPER(GtkMisc, copy_clipboard, void, (void* label), 1, label);
-WRAPPER(GtkMisc, populate_popup, void, (void* label, void* menu), 2, label, menu);
-WRAPPER(GtkMisc, activate_link, int, (void* label, void* uri), 2, label, uri);
+// ----- GtkLabel2Class ------
+// wrapper x86 -> natives of callbacks
+WRAPPER(GtkMisc2, move_cursor, void, (void* label, int step, int count, int extend_selection), 4, label, step, count, extend_selection);
+WRAPPER(GtkMisc2, copy_clipboard, void, (void* label), 1, label);
+WRAPPER(GtkMisc2, populate_popup, void, (void* label, void* menu), 2, label, menu);
+WRAPPER(GtkMisc2, activate_link, int, (void* label, void* uri), 2, label, uri);
 
 #define SUPERGO() \
     GO(move_cursor, vFpiii);    \
@@ -496,49 +739,49 @@ WRAPPER(GtkMisc, activate_link, int, (void* label, void* uri), 2, label, uri);
     GO(activate_link, iFpp);    \
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkLabelClass(my_GtkLabelClass_t* class)
+static void wrapGtkLabel2Class(my_GtkLabel2Class_t* class)
 {
-    wrapGtkMiscClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkMisc (W, class->A)
+    wrapGtkMisc2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkMisc2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkLabelClass(my_GtkLabelClass_t* class)
+static void unwrapGtkLabel2Class(my_GtkLabel2Class_t* class)
 {   
-    unwrapGtkMiscClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkMisc (class->A)
+    unwrapGtkMisc2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkMisc2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkLabelClass(my_GtkLabelClass_t* class)
+static void bridgeGtkLabel2Class(my_GtkLabel2Class_t* class)
 {
-    bridgeGtkMiscClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkMisc (W, class->A)
+    bridgeGtkMisc2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkMisc2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 #undef SUPERGO
 
-// ----- GtkTreeViewClass ------
-// wrapper x64 -> natives of callbacks
-WRAPPER(GtkTreeView, set_scroll_adjustments, void, (void* tree_view, void* hadjustment, void* vadjustment), 3, tree_view, hadjustment, vadjustment);
-WRAPPER(GtkTreeView, row_activated, void, (void* tree_view, void* path, void* column), 3, tree_view, path, column);
-WRAPPER(GtkTreeView, test_expand_row, int, (void* tree_view, void* iter, void* path), 3, tree_view, iter, path);
-WRAPPER(GtkTreeView, test_collapse_row, int, (void* tree_view, void* iter, void* path), 3, tree_view, iter, path);
-WRAPPER(GtkTreeView, row_expanded, void, (void* tree_view, void* iter, void* path), 3, tree_view, iter, path);
-WRAPPER(GtkTreeView, row_collapsed, void, (void* tree_view, void* iter, void* path), 3, tree_view, iter, path);
-WRAPPER(GtkTreeView, columns_changed, void, (void* tree_view), 1, tree_view);
-WRAPPER(GtkTreeView, cursor_changed, void, (void* tree_view), 1, tree_view);
-WRAPPER(GtkTreeView, move_cursor, int, (void* tree_view, int step, int count), 3, tree_view, step, count);
-WRAPPER(GtkTreeView, select_all, int, (void* tree_view), 1, tree_view);
-WRAPPER(GtkTreeView, unselect_all, int, (void* tree_view), 1, tree_view);
-WRAPPER(GtkTreeView, select_cursor_row, int, (void* tree_view, int start_editing), 2, tree_view, start_editing);
-WRAPPER(GtkTreeView, toggle_cursor_row, int, (void* tree_view), 1, tree_view);
-WRAPPER(GtkTreeView, expand_collapse_cursor_row, int, (void* tree_view, int logical, int expand, int open_all), 4, tree_view, logical, expand, open_all);
-WRAPPER(GtkTreeView, select_cursor_parent, int, (void* tree_view), 1, tree_view);
-WRAPPER(GtkTreeView, start_interactive_search, int, (void* tree_view), 1, tree_view);
+// ----- GtkTreeView2Class ------
+// wrapper x86 -> natives of callbacks
+WRAPPER(GtkTreeView2, set_scroll_adjustments, void, (void* tree_view, void* hadjustment, void* vadjustment), 3, tree_view, hadjustment, vadjustment);
+WRAPPER(GtkTreeView2, row_activated, void, (void* tree_view, void* path, void* column), 3, tree_view, path, column);
+WRAPPER(GtkTreeView2, test_expand_row, int, (void* tree_view, void* iter, void* path), 3, tree_view, iter, path);
+WRAPPER(GtkTreeView2, test_collapse_row, int, (void* tree_view, void* iter, void* path), 3, tree_view, iter, path);
+WRAPPER(GtkTreeView2, row_expanded, void, (void* tree_view, void* iter, void* path), 3, tree_view, iter, path);
+WRAPPER(GtkTreeView2, row_collapsed, void, (void* tree_view, void* iter, void* path), 3, tree_view, iter, path);
+WRAPPER(GtkTreeView2, columns_changed, void, (void* tree_view), 1, tree_view);
+WRAPPER(GtkTreeView2, cursor_changed, void, (void* tree_view), 1, tree_view);
+WRAPPER(GtkTreeView2, move_cursor, int, (void* tree_view, int step, int count), 3, tree_view, step, count);
+WRAPPER(GtkTreeView2, select_all, int, (void* tree_view), 1, tree_view);
+WRAPPER(GtkTreeView2, unselect_all, int, (void* tree_view), 1, tree_view);
+WRAPPER(GtkTreeView2, select_cursor_row, int, (void* tree_view, int start_editing), 2, tree_view, start_editing);
+WRAPPER(GtkTreeView2, toggle_cursor_row, int, (void* tree_view), 1, tree_view);
+WRAPPER(GtkTreeView2, expand_collapse_cursor_row, int, (void* tree_view, int logical, int expand, int open_all), 4, tree_view, logical, expand, open_all);
+WRAPPER(GtkTreeView2, select_cursor_parent, int, (void* tree_view), 1, tree_view);
+WRAPPER(GtkTreeView2, start_interactive_search, int, (void* tree_view), 1, tree_view);
 
 #define SUPERGO() \
     GO(set_scroll_adjustments, vFppp);      \
@@ -559,58 +802,58 @@ WRAPPER(GtkTreeView, start_interactive_search, int, (void* tree_view), 1, tree_v
     GO(start_interactive_search, iFp);      \
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkTreeViewClass(my_GtkTreeViewClass_t* class)
+static void wrapGtkTreeView2Class(my_GtkTreeView2Class_t* class)
 {
-    wrapGtkContainerClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkTreeView (W, class->A)
+    wrapGtkContainer2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkTreeView2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkTreeViewClass(my_GtkTreeViewClass_t* class)
+static void unwrapGtkTreeView2Class(my_GtkTreeView2Class_t* class)
 {   
-    unwrapGtkContainerClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkTreeView (class->A)
+    unwrapGtkContainer2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkTreeView2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkTreeViewClass(my_GtkTreeViewClass_t* class)
+static void bridgeGtkTreeView2Class(my_GtkTreeView2Class_t* class)
 {
-    bridgeGtkContainerClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkTreeView (W, class->A)
+    bridgeGtkContainer2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkTreeView2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 
 #undef SUPERGO
 
-// ----- GtkBinClass ------
+// ----- GtkBin2Class ------
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkBinClass(my_GtkBinClass_t* class)
+static void wrapGtkBin2Class(my_GtkBin2Class_t* class)
 {
-    wrapGtkContainerClass(&class->parent_class);
+    wrapGtkContainer2Class(&class->parent_class);
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkBinClass(my_GtkBinClass_t* class)
+static void unwrapGtkBin2Class(my_GtkBin2Class_t* class)
 {   
-    unwrapGtkContainerClass(&class->parent_class);
+    unwrapGtkContainer2Class(&class->parent_class);
 }
 // autobridge
-static void bridgeGtkBinClass(my_GtkBinClass_t* class)
+static void bridgeGtkBin2Class(my_GtkBin2Class_t* class)
 {
-    bridgeGtkContainerClass(&class->parent_class);
+    bridgeGtkContainer2Class(&class->parent_class);
 }
 
-// ----- GtkWindowClass ------
-// wrapper x64 -> natives of callbacks
-WRAPPER(GtkWindow, set_focus, void, (void* window, void* focus), 2, window, focus);
-WRAPPER(GtkWindow, frame_event, int, (void* window, void* event), 2, window, event);
-WRAPPER(GtkWindow, activate_focus, void, (void* window), 1, window);
-WRAPPER(GtkWindow, activate_default, void, (void* window), 1, window);
-WRAPPER(GtkWindow, move_focus, void, (void* window, int direction), 2, window, direction);
-WRAPPER(GtkWindow, keys_changed, void, (void* window), 1, window);
+// ----- GtkWindow2Class ------
+// wrapper x86 -> natives of callbacks
+WRAPPER(GtkWindow2, set_focus, void, (void* window, void* focus), 2, window, focus);
+WRAPPER(GtkWindow2, frame_event, int, (void* window, void* event), 2, window, event);
+WRAPPER(GtkWindow2, activate_focus, void, (void* window), 1, window);
+WRAPPER(GtkWindow2, activate_default, void, (void* window), 1, window);
+WRAPPER(GtkWindow2, move_focus, void, (void* window, int direction), 2, window, direction);
+WRAPPER(GtkWindow2, keys_changed, void, (void* window), 1, window);
 
 #define SUPERGO()               \
     GO(set_focus, vFpp);        \
@@ -622,94 +865,130 @@ WRAPPER(GtkWindow, keys_changed, void, (void* window), 1, window);
 
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkWindowClass(my_GtkWindowClass_t* class)
+static void wrapGtkWindow2Class(my_GtkWindow2Class_t* class)
 {
-    wrapGtkBinClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkWindow (W, class->A)
+    wrapGtkBin2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkWindow2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkWindowClass(my_GtkWindowClass_t* class)
+static void unwrapGtkWindow2Class(my_GtkWindow2Class_t* class)
 {   
-    unwrapGtkBinClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkWindow (class->A)
+    unwrapGtkBin2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkWindow2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkWindowClass(my_GtkWindowClass_t* class)
+static void bridgeGtkWindow2Class(my_GtkWindow2Class_t* class)
 {
-    bridgeGtkBinClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkWindow (W, class->A)
+    bridgeGtkBin2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkWindow2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 
-// ----- GtkTableClass ------
+#undef SUPERGO
+
+// ----- GtkTable2Class ------
+// wrap (so bridge all calls, just in case)
+static void wrapGtkTable2Class(my_GtkTable2Class_t* class)
+{
+    wrapGtkContainer2Class(&class->parent_class);
+}
+// unwrap (and use callback if not a native call anymore)
+static void unwrapGtkTable2Class(my_GtkTable2Class_t* class)
+{   
+    unwrapGtkContainer2Class(&class->parent_class);
+}
+// autobridge
+static void bridgeGtkTable2Class(my_GtkTable2Class_t* class)
+{
+    bridgeGtkContainer2Class(&class->parent_class);
+}
+
+// ----- GtkFixed2Class ------
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkTableClass(my_GtkTableClass_t* class)
+static void wrapGtkFixed2Class(my_GtkFixed2Class_t* class)
 {
-    wrapGtkContainerClass(&class->parent_class);
+    wrapGtkContainer2Class(&class->parent_class);
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkTableClass(my_GtkTableClass_t* class)
+static void unwrapGtkFixed2Class(my_GtkFixed2Class_t* class)
 {   
-    unwrapGtkContainerClass(&class->parent_class);
+    unwrapGtkContainer2Class(&class->parent_class);
 }
 // autobridge
-static void bridgeGtkTableClass(my_GtkTableClass_t* class)
+static void bridgeGtkFixed2Class(my_GtkFixed2Class_t* class)
 {
-    bridgeGtkContainerClass(&class->parent_class);
+    bridgeGtkContainer2Class(&class->parent_class);
 }
 
-// ----- GtkFixedClass ------
+// ----- MetaFrames2Class ------
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkFixedClass(my_GtkFixedClass_t* class)
+static void wrapMetaFrames2Class(my_MetaFrames2Class_t* class)
 {
-    wrapGtkContainerClass(&class->parent_class);
+    wrapGtkWindow2Class(&class->parent_class);
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkFixedClass(my_GtkFixedClass_t* class)
+static void unwrapMetaFrames2Class(my_MetaFrames2Class_t* class)
 {   
-    unwrapGtkContainerClass(&class->parent_class);
+    unwrapGtkWindow2Class(&class->parent_class);
 }
 // autobridge
-static void bridgeGtkFixedClass(my_GtkFixedClass_t* class)
+static void bridgeMetaFrames2Class(my_MetaFrames2Class_t* class)
 {
-    bridgeGtkContainerClass(&class->parent_class);
+    bridgeGtkWindow2Class(&class->parent_class);
 }
 
-// ----- MetaFramesClass ------
+// ----- 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), 6, manager, object_proxy, interface_proxy, sender_name, signal_name, parameters);
+WRAPPER(GDBusObjectManagerClient,interface_proxy_properties_changed, void, (void* manager, void* object_proxy, void* interface_proxy, void* changed_properties, void* invalidated_properties), 5, manager, object_proxy, interface_proxy, changed_properties, invalidated_properties);
+
+#define SUPERGO()                                       \
+    GO(interface_proxy_signal, vFpppppp);               \
+    GO(interface_proxy_properties_changed, vFppppp);    \
+
 
 // wrap (so bridge all calls, just in case)
-static void wrapMetaFramesClass(my_MetaFramesClass_t* class)
+static void wrapGDBusObjectManagerClientClass(my_GDBusObjectManagerClientClass_t* class)
 {
-    wrapGtkWindowClass(&class->parent_class);
+    wrapGObjectClass(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GDBusObjectManagerClient (W, class->A)
+    SUPERGO()
+    #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapMetaFramesClass(my_MetaFramesClass_t* class)
+static void unwrapGDBusObjectManagerClientClass(my_GDBusObjectManagerClientClass_t* class)
 {   
-    unwrapGtkWindowClass(&class->parent_class);
+    unwrapGObjectClass(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GDBusObjectManagerClient (class->A)
+    SUPERGO()
+    #undef GO
 }
 // autobridge
-static void bridgeMetaFramesClass(my_MetaFramesClass_t* class)
+static void bridgeGDBusObjectManagerClientClass(my_GDBusObjectManagerClientClass_t* class)
 {
-    bridgeGtkWindowClass(&class->parent_class);
+    bridgeGObjectClass(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GDBusObjectManagerClient (W, class->A)
+    SUPERGO()
+    #undef GO
 }
 
 #undef SUPERGO
 
-// ----- GtkButtonClass ------
+// ----- GtkButton2Class ------
 // wrapper x86 -> natives of callbacks
-WRAPPER(GtkButton, pressed, void,  (void* button), 1, button);
-WRAPPER(GtkButton, released, void, (void* button), 1, button);
-WRAPPER(GtkButton, clicked, void,  (void* button), 1, button);
-WRAPPER(GtkButton, enter, void,    (void* button), 1, button);
-WRAPPER(GtkButton, leave, void,    (void* button), 1, button);
-WRAPPER(GtkButton, activate, void, (void* button), 1, button);
+WRAPPER(GtkButton2, pressed, void,  (void* button), 1, button);
+WRAPPER(GtkButton2, released, void, (void* button), 1, button);
+WRAPPER(GtkButton2, clicked, void,  (void* button), 1, button);
+WRAPPER(GtkButton2, enter, void,    (void* button), 1, button);
+WRAPPER(GtkButton2, leave, void,    (void* button), 1, button);
+WRAPPER(GtkButton2, activate, void, (void* button), 1, button);
 
 #define SUPERGO()               \
     GO(pressed, vFp);           \
@@ -721,36 +1000,36 @@ WRAPPER(GtkButton, activate, void, (void* button), 1, button);
 
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkButtonClass(my_GtkButtonClass_t* class)
+static void wrapGtkButton2Class(my_GtkButton2Class_t* class)
 {
-    wrapGtkBinClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkButton (W, class->A)
+    wrapGtkBin2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkButton2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkButtonClass(my_GtkButtonClass_t* class)
+static void unwrapGtkButton2Class(my_GtkButton2Class_t* class)
 {   
-    unwrapGtkBinClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkButton (class->A)
+    unwrapGtkBin2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkButton2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkButtonClass(my_GtkButtonClass_t* class)
+static void bridgeGtkButton2Class(my_GtkButton2Class_t* class)
 {
-    bridgeGtkBinClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkButton (W, class->A)
+    bridgeGtkBin2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkButton2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 
 #undef SUPERGO
 
-// ----- GtkComboBoxClass ------
+// ----- GtkComboBox2Class ------
 // wrapper x86 -> natives of callbacks
-WRAPPER(GtkComboBox, changed, void, (void* combo_box), 1, combo_box);
-WRAPPER(GtkComboBox, get_active_text, void*, (void* combo_box), 1, combo_box);
+WRAPPER(GtkComboBox2, changed, void, (void* combo_box), 1, combo_box);
+WRAPPER(GtkComboBox2, get_active_text, void*, (void* combo_box), 1, combo_box);
 
 #define SUPERGO()               \
     GO(changed, vFp);           \
@@ -758,115 +1037,115 @@ WRAPPER(GtkComboBox, get_active_text, void*, (void* combo_box), 1, combo_box);
 
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkComboBoxClass(my_GtkComboBoxClass_t* class)
+static void wrapGtkComboBox2Class(my_GtkComboBox2Class_t* class)
 {
-    wrapGtkBinClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkComboBox (W, class->A)
+    wrapGtkBin2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkComboBox2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkComboBoxClass(my_GtkComboBoxClass_t* class)
+static void unwrapGtkComboBox2Class(my_GtkComboBox2Class_t* class)
 {   
-    unwrapGtkBinClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkComboBox (class->A)
+    unwrapGtkBin2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkComboBox2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkComboBoxClass(my_GtkComboBoxClass_t* class)
+static void bridgeGtkComboBox2Class(my_GtkComboBox2Class_t* class)
 {
-    bridgeGtkBinClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkComboBox (W, class->A)
+    bridgeGtkBin2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkComboBox2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 
 #undef SUPERGO
 
-// ----- GtkToggleButtonClass ------
+// ----- GtkToggleButton2Class ------
 // wrapper x86 -> natives of callbacks
-WRAPPER(GtkToggleButton, toggled, void, (void* toggle_button), 1, toggle_button);
+WRAPPER(GtkToggleButton2, toggled, void, (void* toggle_button), 1, toggle_button);
 
 #define SUPERGO()               \
     GO(toggled, vFp);           \
 
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkToggleButtonClass(my_GtkToggleButtonClass_t* class)
+static void wrapGtkToggleButton2Class(my_GtkToggleButton2Class_t* class)
 {
-    wrapGtkButtonClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkToggleButton (W, class->A)
+    wrapGtkButton2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkToggleButton2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkToggleButtonClass(my_GtkToggleButtonClass_t* class)
+static void unwrapGtkToggleButton2Class(my_GtkToggleButton2Class_t* class)
 {   
-    unwrapGtkButtonClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkToggleButton (class->A)
+    unwrapGtkButton2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkToggleButton2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkToggleButtonClass(my_GtkToggleButtonClass_t* class)
+static void bridgeGtkToggleButton2Class(my_GtkToggleButton2Class_t* class)
 {
-    bridgeGtkButtonClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkToggleButton (W, class->A)
+    bridgeGtkButton2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkToggleButton2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 
 #undef SUPERGO
 
-// ----- GtkCheckButtonClass ------
+// ----- GtkCheckButton2Class ------
 // wrapper x86 -> natives of callbacks
-WRAPPER(GtkCheckButton, draw_indicator, void, (void* check_button, void* area), 2, check_button, area);
+WRAPPER(GtkCheckButton2, draw_indicator, void, (void* check_button, void* area), 2, check_button, area);
 
 #define SUPERGO()               \
     GO(draw_indicator, vFpp);   \
 
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkCheckButtonClass(my_GtkCheckButtonClass_t* class)
+static void wrapGtkCheckButton2Class(my_GtkCheckButton2Class_t* class)
 {
-    wrapGtkToggleButtonClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkCheckButton (W, class->A)
+    wrapGtkToggleButton2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkCheckButton2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkCheckButtonClass(my_GtkCheckButtonClass_t* class)
+static void unwrapGtkCheckButton2Class(my_GtkCheckButton2Class_t* class)
 {   
-    unwrapGtkToggleButtonClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkCheckButton (class->A)
+    unwrapGtkToggleButton2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkCheckButton2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkCheckButtonClass(my_GtkCheckButtonClass_t* class)
+static void bridgeGtkCheckButton2Class(my_GtkCheckButton2Class_t* class)
 {
-    bridgeGtkToggleButtonClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkCheckButton (W, class->A)
+    bridgeGtkToggleButton2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkCheckButton2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 
 #undef SUPERGO
 
-// ----- GtkEntryClass ------
+// ----- GtkEntry2Class ------
 // wrapper x86 -> natives of callbacks
-WRAPPER(GtkEntry, populate_popup, void,     (void* entry, void* menu), 2, entry, menu);
-WRAPPER(GtkEntry, activate, void,           (void* entry), 1, entry);
-WRAPPER(GtkEntry, move_cursor, void,        (void* entry, int step, int count, int extend_selection), 4, entry, step, count, extend_selection);
-WRAPPER(GtkEntry, insert_at_cursor, void,   (void* entry, void* str), 2, entry, str);
-WRAPPER(GtkEntry, delete_from_cursor, void, (void* entry, int type, int count), 3, entry, type, count);
-WRAPPER(GtkEntry, backspace, void,          (void* entry), 1, entry);
-WRAPPER(GtkEntry, cut_clipboard, void,      (void* entry), 1, entry);
-WRAPPER(GtkEntry, copy_clipboard, void,     (void* entry), 1, entry);
-WRAPPER(GtkEntry, paste_clipboard, void,    (void* entry), 1, entry);
-WRAPPER(GtkEntry, toggle_overwrite, void,   (void* entry), 1, entry);
-WRAPPER(GtkEntry, get_text_area_size, void, (void* entry, void* x, void* y, void* width, void* height), 5, entry, x, y, width, height);
+WRAPPER(GtkEntry2, populate_popup, void,     (void* entry, void* menu), 2, entry, menu);
+WRAPPER(GtkEntry2, activate, void,           (void* entry), 1, entry);
+WRAPPER(GtkEntry2, move_cursor, void,        (void* entry, int step, int count, int extend_selection), 4, entry, step, count, extend_selection);
+WRAPPER(GtkEntry2, insert_at_cursor, void,   (void* entry, void* str), 2, entry, str);
+WRAPPER(GtkEntry2, delete_from_cursor, void, (void* entry, size_t type, int count), 3, entry, type, count);
+WRAPPER(GtkEntry2, backspace, void,          (void* entry), 1, entry);
+WRAPPER(GtkEntry2, cut_clipboard, void,      (void* entry), 1, entry);
+WRAPPER(GtkEntry2, copy_clipboard, void,     (void* entry), 1, entry);
+WRAPPER(GtkEntry2, paste_clipboard, void,    (void* entry), 1, entry);
+WRAPPER(GtkEntry2, toggle_overwrite, void,   (void* entry), 1, entry);
+WRAPPER(GtkEntry2, get_text_area_size, void, (void* entry, void* x, void* y, void* width, void* height), 5, entry, x, y, width, height);
 
 #define SUPERGO()                   \
     GO(populate_popup, vFpp);       \
@@ -882,39 +1161,39 @@ WRAPPER(GtkEntry, get_text_area_size, void, (void* entry, void* x, void* y, void
     GO(get_text_area_size, vFppppp);\
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkEntryClass(my_GtkEntryClass_t* class)
+static void wrapGtkEntry2Class(my_GtkEntry2Class_t* class)
 {
-    wrapGtkWidgetClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkEntry (W, class->A)
+    wrapGtkWidget2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkEntry2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkEntryClass(my_GtkEntryClass_t* class)
+static void unwrapGtkEntry2Class(my_GtkEntry2Class_t* class)
 {   
-    unwrapGtkWidgetClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkEntry (class->A)
+    unwrapGtkWidget2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkEntry2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkEntryClass(my_GtkEntryClass_t* class)
+static void bridgeGtkEntry2Class(my_GtkEntry2Class_t* class)
 {
-    bridgeGtkWidgetClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkEntry (W, class->A)
+    bridgeGtkWidget2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkEntry2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 
 #undef SUPERGO
 
-// ----- GtkSpinButtonClass ------
+// ----- GtkSpinButton2Class ------
 // wrapper x86 -> natives of callbacks
-WRAPPER(GtkSpinButton, input, int,  (void* spin_button, void* new_value), 2, spin_button, new_value);
-WRAPPER(GtkSpinButton, output, int, (void* spin_button), 1, spin_button);
-WRAPPER(GtkSpinButton, value_changed, void, (void* spin_button), 1, spin_button);
-WRAPPER(GtkSpinButton, change_value, void, (void* spin_button, int scroll), 2, spin_button, scroll);
-WRAPPER(GtkSpinButton, wrapped, void, (void* spin_button), 1, spin_button);
+WRAPPER(GtkSpinButton2, input, int,  (void* spin_button, void* new_value), 2, spin_button, new_value);
+WRAPPER(GtkSpinButton2, output, int, (void* spin_button), 1, spin_button);
+WRAPPER(GtkSpinButton2, value_changed, void, (void* spin_button), 1, spin_button);
+WRAPPER(GtkSpinButton2, change_value, void, (void* spin_button, int scroll), 2, spin_button, scroll);
+WRAPPER(GtkSpinButton2, wrapped, void, (void* spin_button), 1, spin_button);
 
 #define SUPERGO()           \
     GO(input, iFpp);        \
@@ -924,37 +1203,37 @@ WRAPPER(GtkSpinButton, wrapped, void, (void* spin_button), 1, spin_button);
     GO(wrapped, vFp);       \
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkSpinButtonClass(my_GtkSpinButtonClass_t* class)
+static void wrapGtkSpinButton2Class(my_GtkSpinButton2Class_t* class)
 {
-    wrapGtkEntryClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkSpinButton (W, class->A)
+    wrapGtkEntry2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkSpinButton2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkSpinButtonClass(my_GtkSpinButtonClass_t* class)
+static void unwrapGtkSpinButton2Class(my_GtkSpinButton2Class_t* class)
 {   
-    unwrapGtkEntryClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkSpinButton (class->A)
+    unwrapGtkEntry2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkSpinButton2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkSpinButtonClass(my_GtkSpinButtonClass_t* class)
+static void bridgeGtkSpinButton2Class(my_GtkSpinButton2Class_t* class)
 {
-    bridgeGtkEntryClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkSpinButton (W, class->A)
+    bridgeGtkEntry2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkSpinButton2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 
 #undef SUPERGO
 
-// ----- GtkProgressClass ------
+// ----- GtkProgress2Class ------
 // wrapper x86 -> natives of callbacks
-WRAPPER(GtkProgress, paint, void,          (void* progress), 1, progress);
-WRAPPER(GtkProgress, update, void,         (void* progress), 1, progress);
-WRAPPER(GtkProgress, act_mode_enter, void, (void* progress), 1, progress);
+WRAPPER(GtkProgress2, paint, void,          (void* progress), 1, progress);
+WRAPPER(GtkProgress2, update, void,         (void* progress), 1, progress);
+WRAPPER(GtkProgress2, act_mode_enter, void, (void* progress), 1, progress);
 
 #define SUPERGO()           \
     GO(paint, vFp);         \
@@ -962,109 +1241,109 @@ WRAPPER(GtkProgress, act_mode_enter, void, (void* progress), 1, progress);
     GO(act_mode_enter, vFp);\
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkProgressClass(my_GtkProgressClass_t* class)
+static void wrapGtkProgress2Class(my_GtkProgress2Class_t* class)
 {
-    wrapGtkWidgetClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkProgress (W, class->A)
+    wrapGtkWidget2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkProgress2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkProgressClass(my_GtkProgressClass_t* class)
+static void unwrapGtkProgress2Class(my_GtkProgress2Class_t* class)
 {   
-    unwrapGtkWidgetClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkProgress (class->A)
+    unwrapGtkWidget2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkProgress2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkProgressClass(my_GtkProgressClass_t* class)
+static void bridgeGtkProgress2Class(my_GtkProgress2Class_t* class)
 {
-    bridgeGtkWidgetClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkProgress (W, class->A)
+    bridgeGtkWidget2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkProgress2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 
 #undef SUPERGO
 
-// ----- GtkProgressBarClass ------
+// ----- GtkProgressBar2Class ------
 // no wrapper x86 -> natives of callbacks
 
 #define SUPERGO()           \
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkProgressBarClass(my_GtkProgressBarClass_t* class)
+static void wrapGtkProgressBar2Class(my_GtkProgressBar2Class_t* class)
 {
-    wrapGtkProgressClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkProgressBar (W, class->A)
+    wrapGtkProgress2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkProgressBar2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkProgressBarClass(my_GtkProgressBarClass_t* class)
+static void unwrapGtkProgressBar2Class(my_GtkProgressBar2Class_t* class)
 {   
-    unwrapGtkProgressClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkProgressBar (class->A)
+    unwrapGtkProgress2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkProgressBar2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkProgressBarClass(my_GtkProgressBarClass_t* class)
+static void bridgeGtkProgressBar2Class(my_GtkProgressBar2Class_t* class)
 {
-    bridgeGtkProgressClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkProgressBar (W, class->A)
+    bridgeGtkProgress2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkProgressBar2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 
 #undef SUPERGO
 
-// ----- GtkFrameClass ------
+// ----- GtkFrame2Class ------
 // wrapper x86 -> natives of callbacks
-WRAPPER(GtkFrame, compute_child_allocation, void, (void* frame, void* allocation), 2, frame, allocation);
+WRAPPER(GtkFrame2, compute_child_allocation, void, (void* frame, void* allocation), 2, frame, allocation);
 
 #define SUPERGO()                       \
     GO(compute_child_allocation, vFpp); \
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkFrameClass(my_GtkFrameClass_t* class)
+static void wrapGtkFrame2Class(my_GtkFrame2Class_t* class)
 {
-    wrapGtkBinClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkFrame (W, class->A)
+    wrapGtkBin2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkFrame2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkFrameClass(my_GtkFrameClass_t* class)
+static void unwrapGtkFrame2Class(my_GtkFrame2Class_t* class)
 {   
-    unwrapGtkBinClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkFrame (class->A)
+    unwrapGtkBin2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkFrame2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkFrameClass(my_GtkFrameClass_t* class)
+static void bridgeGtkFrame2Class(my_GtkFrame2Class_t* class)
 {
-    bridgeGtkBinClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkFrame (W, class->A)
+    bridgeGtkBin2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkFrame2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 
 #undef SUPERGO
 
-// ----- GtkMenuShellClass ------
+// ----- GtkMenuShell2Class ------
 // wrapper x86 -> natives of callbacks
-WRAPPER(GtkMenuShell,deactivate, void,      (void* menu_shell), 1, menu_shell);
-WRAPPER(GtkMenuShell,selection_done, void,  (void* menu_shell), 1, menu_shell);
-WRAPPER(GtkMenuShell,move_current, void,    (void* menu_shell, int direction), 2, menu_shell, direction);
-WRAPPER(GtkMenuShell,activate_current, void,(void* menu_shell, int force_hide), 2, menu_shell, force_hide);
-WRAPPER(GtkMenuShell,cancel, void,          (void* menu_shell), 1, menu_shell);
-WRAPPER(GtkMenuShell,select_item, void,     (void* menu_shell, void* menu_item), 2, menu_shell, menu_item);
-WRAPPER(GtkMenuShell,insert, void,          (void* menu_shell, void* child, int position), 3, menu_shell, child, position);
-WRAPPER(GtkMenuShell,get_popup_delay, int,  (void* menu_shell), 1, menu_shell);
-WRAPPER(GtkMenuShell,move_selected, int,    (void* menu_shell, int distance), 2, menu_shell, distance);
+WRAPPER(GtkMenuShell2,deactivate, void,      (void* menu_shell), 1, menu_shell);
+WRAPPER(GtkMenuShell2,selection_done, void,  (void* menu_shell), 1, menu_shell);
+WRAPPER(GtkMenuShell2,move_current, void,    (void* menu_shell, int direction), 2, menu_shell, direction);
+WRAPPER(GtkMenuShell2,activate_current, void,(void* menu_shell, int force_hide), 2, menu_shell, force_hide);
+WRAPPER(GtkMenuShell2,cancel, void,          (void* menu_shell), 1, menu_shell);
+WRAPPER(GtkMenuShell2,select_item, void,     (void* menu_shell, void* menu_item), 2, menu_shell, menu_item);
+WRAPPER(GtkMenuShell2,insert, void,          (void* menu_shell, void* child, int position), 3, menu_shell, child, position);
+WRAPPER(GtkMenuShell2,get_popup_delay, int,  (void* menu_shell), 1, menu_shell);
+WRAPPER(GtkMenuShell2,move_selected, int,    (void* menu_shell, int distance), 2, menu_shell, distance);
 
 #define SUPERGO()               \
     GO(deactivate, vFp);        \
@@ -1078,58 +1357,58 @@ WRAPPER(GtkMenuShell,move_selected, int,    (void* menu_shell, int distance), 2,
     GO(move_selected, iFpi);    \
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkMenuShellClass(my_GtkMenuShellClass_t* class)
+static void wrapGtkMenuShell2Class(my_GtkMenuShell2Class_t* class)
 {
-    wrapGtkContainerClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkMenuShell (W, class->A)
+    wrapGtkContainer2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkMenuShell2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkMenuShellClass(my_GtkMenuShellClass_t* class)
+static void unwrapGtkMenuShell2Class(my_GtkMenuShell2Class_t* class)
 {   
-    unwrapGtkContainerClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkMenuShell (class->A)
+    unwrapGtkContainer2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkMenuShell2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkMenuShellClass(my_GtkMenuShellClass_t* class)
+static void bridgeGtkMenuShell2Class(my_GtkMenuShell2Class_t* class)
 {
-    bridgeGtkContainerClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkMenuShell (W, class->A)
+    bridgeGtkContainer2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkMenuShell2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 
 #undef SUPERGO
 
-// ----- GtkMenuBarClass ------
+// ----- GtkMenuBar2Class ------
 // no wrapper x86 -> natives of callbacks
 
 #define SUPERGO()           \
 
 // wrap (so bridge all calls, just in case)
-static void wrapGtkMenuBarClass(my_GtkMenuBarClass_t* class)
+static void wrapGtkMenuBar2Class(my_GtkMenuBar2Class_t* class)
 {
-    wrapGtkMenuShellClass(&class->parent_class);
-    #define GO(A, W) class->A = reverse_##A##_GtkMenuBar (W, class->A)
+    wrapGtkMenuShell2Class(&class->parent_class);
+    #define GO(A, W) class->A = reverse_##A##_GtkMenuBar2 (W, class->A)
     SUPERGO()
     #undef GO
 }
 // unwrap (and use callback if not a native call anymore)
-static void unwrapGtkMenuBarClass(my_GtkMenuBarClass_t* class)
+static void unwrapGtkMenuBar2Class(my_GtkMenuBar2Class_t* class)
 {   
-    unwrapGtkMenuShellClass(&class->parent_class);
-    #define GO(A, W)   class->A = find_##A##_GtkMenuBar (class->A)
+    unwrapGtkMenuShell2Class(&class->parent_class);
+    #define GO(A, W)   class->A = find_##A##_GtkMenuBar2 (class->A)
     SUPERGO()
     #undef GO
 }
 // autobridge
-static void bridgeGtkMenuBarClass(my_GtkMenuBarClass_t* class)
+static void bridgeGtkMenuBar2Class(my_GtkMenuBar2Class_t* class)
 {
-    bridgeGtkMenuShellClass(&class->parent_class);
-    #define GO(A, W) autobridge_##A##_GtkMenuBar (W, class->A)
+    bridgeGtkMenuShell2Class(&class->parent_class);
+    #define GO(A, W) autobridge_##A##_GtkMenuBar2 (W, class->A)
     SUPERGO()
     #undef GO
 }
@@ -1150,13 +1429,14 @@ static void wrapGTKClass(void* cl, size_t type)
         wrap##A##Class((my_##A##Class_t*)cl);       \
     else 
 
+    printf_log(LOG_DEBUG, "wrapCopyGTKClass(%p, %d (%s))\n", cl, type, g_type_name(type));
     GTKCLASSES()
     {
-        if(my_MetaFrames==-1 && !strcmp(g_type_name(type), "MetaFrames")) {
-            my_MetaFrames = type;
-            wrapMetaFramesClass((my_MetaFramesClass_t*)cl);
+        if(my_MetaFrames2==-1 && !strcmp(g_type_name(type), "MetaFrames2")) {
+            my_MetaFrames2 = type;
+            wrapMetaFrames2Class((my_MetaFrames2Class_t*)cl);
         } else
-            printf_log(LOG_NONE, "Warning, Custom Class initializer with unknown class type %zu (%s)\n", type, g_type_name(type));
+            printf_log(LOG_NONE, "Warning, Custom Class initializer with unknown class type %d (%s)\n", type, g_type_name(type));
     }
     #undef GTKCLASS
 }
@@ -1168,14 +1448,9 @@ static void unwrapGTKClass(void* cl, size_t type)
         unwrap##A##Class((my_##A##Class_t*)cl);     \
     else 
 
+    printf_log(LOG_DEBUG, "unwrapGTKClass(%p, %d (%s))\n", cl, type, g_type_name(type));
     GTKCLASSES()
-    {
-        if(my_MetaFrames==-1 && !strcmp(g_type_name(type), "MetaFrames")) {
-            my_MetaFrames = type;
-            unwrapMetaFramesClass((my_MetaFramesClass_t*)cl);
-        } else
-            printf_log(LOG_NONE, "Warning, Custom Class initializer with unknown class type %zu (%s)\n", type, g_type_name(type));
-    }
+    {}  // else no warning, one is enough...
     #undef GTKCLASS
 }
 
@@ -1186,9 +1461,10 @@ static void bridgeGTKClass(void* cl, size_t type)
         bridge##A##Class((my_##A##Class_t*)cl);     \
     else 
 
+    printf_log(LOG_DEBUG, "bridgeGTKClass(%p, %d (%s))\n", cl, type, g_type_name(type));
     GTKCLASSES()
     {
-        printf_log(LOG_NONE, "Warning, AutoBridge GTK Class with unknown class type %zu (%s)\n", type, g_type_name(type));
+        printf_log(LOG_NONE, "Warning, AutoBridge GTK Class with unknown class type %d (%s)\n", type, g_type_name(type));
     }
     #undef GTKCLASS
 }
@@ -1246,22 +1522,17 @@ SUPER()
 void* wrapCopyGTKClass(void* klass, size_t type)
 {
     if(!klass) return klass;
+    printf_log(LOG_DEBUG, "wrapCopyGTKClass(%p, %d (%s))\n", klass, type, g_type_name(type));
     #define GO(A) if(klass == my_gclassallu_ref_##A) return &my_gclassallu_##A;
     SUPER()
     #undef GO
     // check if class is the exact type we know
-    size_t sz = 0;
+    int sz = 0;
     #define GTKCLASS(A) if(type==my_##A) sz = sizeof(my_##A##Class_t); else
     GTKCLASSES()
     {
-        if(my_MetaFrames==(size_t)-1 && !strcmp(g_type_name(type), "MetaFrames")) {
-            my_MetaFrames = type;
-            sz = sizeof(my_MetaFramesClass_t);
-        }
-        if(!sz) {
-            printf_log(LOG_NONE, "Warning, wrapCopyGTKClass called with unknown class type %p (%s)\n", (void*)type, g_type_name(type));
-            return klass;
-        }
+        printf_log(LOG_NONE, "Warning, wrapCopyGTKClass called with unknown class type 0x%x (%s)\n", type, g_type_name(type));
+        return klass;
     }
     #undef GTKCLASS
     my_GClassAll_t *newklass = NULL;
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 7790501f..65bf8028 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -230,10 +230,12 @@
 #() pFiI
 #() pFiu
 #() pFip
+#() pFiV
 #() pFui
 #() pFuC
 #() pFuu
 #() pFup
+#() pFuV
 #() pFUi
 #() pFUU
 #() pFdi
@@ -297,6 +299,7 @@
 #() vFfpp
 #() vFddd
 #() vFdpp
+#() vFLup
 #() vFLpL
 #() vFLpp
 #() vFpii
@@ -335,6 +338,7 @@
 #() iFEWW
 #() iFEup
 #() iFEUU
+#() iFELp
 #() iFEpi
 #() iFEpL
 #() iFEpp
@@ -662,6 +666,7 @@
 #() vFppii
 #() vFppiu
 #() vFppid
+#() vFppil
 #() vFppiL
 #() vFppip
 #() vFppui
@@ -1074,10 +1079,12 @@
 #() vFppuup
 #() vFppupi
 #() vFppupp
+#() vFppddp
 #() vFpppii
 #() vFpppip
 #() vFpppuu
 #() vFpppup
+#() vFpppdd
 #() vFppppi
 #() vFppppu
 #() vFppppL
@@ -1345,6 +1352,7 @@
 #() vFpiUuup
 #() vFpipipV
 #() vFpipppi
+#() vFpipppp
 #() vFpuiiii
 #() vFpuiiiu
 #() vFpuiipp
@@ -1360,6 +1368,7 @@
 #() vFpUUiup
 #() vFpdddii
 #() vFpddddd
+#() vFpddddp
 #() vFppiiii
 #() vFppiiip
 #() vFppiiui
@@ -1372,6 +1381,7 @@
 #() vFppupii
 #() vFppuppp
 #() vFppdidd
+#() vFppdddd
 #() vFpplppi
 #() vFpplppp
 #() vFppLppi
@@ -1608,6 +1618,8 @@
 #() vFppipiip
 #() vFppipipp
 #() vFppipppp
+#() vFppddddi
+#() vFppddpii
 #() vFppLpppi
 #() vFppLpppp
 #() vFpppiiii
@@ -1885,6 +1897,7 @@
 #() vFppipppiip
 #() vFppuuiiiii
 #() vFppUUiUUUU
+#() vFppddddidd
 #() vFpplpppppi
 #() vFpppiiiiii
 #() vFppppipiip
@@ -2101,7 +2114,6 @@
 #!defined(HAVE_LD80BITS) KFKp
 #!defined(HAVE_LD80BITS) vFppippKKC
 #defined(NOALIGN) iFipiip
-#!defined(NOALIGN) iFELp
 #!defined(NOALIGN) iFEppu
 #!defined(NOALIGN) iFEiiip
 #!defined(NOALIGN) iFEipii
@@ -2253,6 +2265,19 @@ wrappedfreetype:
 wrappedgbm:
 wrappedgconf2:
 wrappedgcrypt:
+wrappedgdk3:
+- vFpp:
+  - gdk_init
+- iFpp:
+  - gdk_init_check
+- vFppp:
+  - gdk_event_handler_set
+  - gdk_window_add_filter
+  - gdk_window_remove_filter
+- iFiipp:
+  - gdk_input_add
+- iFiippp:
+  - gdk_input_add_full
 wrappedgdkpixbuf2:
 - pFpiiiiiipp:
   - gdk_pixbuf_new_from_data
@@ -2595,6 +2620,59 @@ wrappedgthread2:
 - vFp:
   - g_thread_init
   - g_thread_init_with_errorcheck_mutexes
+wrappedgtk3:
+- pFi:
+  - gtk_type_class
+- vFpp:
+  - gtk_builder_connect_signals
+  - gtk_init
+- iFLp:
+  - gtk_type_unique
+- iFpp:
+  - gtk_init_check
+- vFppp:
+  - gtk_builder_connect_signals_full
+  - gtk_container_forall
+  - gtk_menu_attach_to_widget
+- vFppV:
+  - gtk_dialog_add_buttons
+  - gtk_message_dialog_format_secondary_markup
+  - gtk_message_dialog_format_secondary_text
+- uFupp:
+  - gtk_timeout_add
+- vFpppp:
+  - gtk_object_set_data_full
+  - gtk_stock_set_translate_func
+  - gtk_tree_sortable_set_default_sort_func
+  - gtk_tree_view_set_search_equal_func
+- iFpppp:
+  - gtk_text_iter_backward_find_char
+  - gtk_text_iter_forward_find_char
+- vFpippp:
+  - gtk_tree_sortable_set_sort_func
+- vFppppp:
+  - gtk_tree_view_column_set_cell_data_func
+- iFppuppp:
+  - gtk_clipboard_set_with_data
+  - gtk_clipboard_set_with_owner
+- iFpppppp:
+  - gtk_init_with_args
+- vFpppppuu:
+  - gtk_menu_popup
+- pFppppppi:
+  - gtk_toolbar_insert_stock
+- pFppppppp:
+  - gtk_toolbar_append_item
+  - gtk_toolbar_prepend_item
+- LFppppppii:
+  - gtk_signal_connect_full
+- pFpppppppi:
+  - gtk_toolbar_insert_item
+- pFpippppppp:
+  - gtk_toolbar_append_element
+  - gtk_toolbar_prepend_element
+- pFpipppppppi:
+  - gtk_toolbar_insert_element
 wrappedgtkx112:
 - fFp:
   - gtk_spin_button_get_value_as_float
diff --git a/src/wrapped/generated/wrappedgdk3defs.h b/src/wrapped/generated/wrappedgdk3defs.h
new file mode 100644
index 00000000..01ef683f
--- /dev/null
+++ b/src/wrapped/generated/wrappedgdk3defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.1.0.16) *
+ *******************************************************************/
+#ifndef __wrappedgdk3DEFS_H_
+#define __wrappedgdk3DEFS_H_
+
+
+#endif // __wrappedgdk3DEFS_H_
diff --git a/src/wrapped/generated/wrappedgdk3types.h b/src/wrapped/generated/wrappedgdk3types.h
new file mode 100644
index 00000000..583a6093
--- /dev/null
+++ b/src/wrapped/generated/wrappedgdk3types.h
@@ -0,0 +1,29 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.1.0.16) *
+ *******************************************************************/
+#ifndef __wrappedgdk3TYPES_H_
+#define __wrappedgdk3TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpp_t)(void*, void*);
+typedef int64_t (*iFpp_t)(void*, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef int64_t (*iFiipp_t)(int64_t, int64_t, void*, void*);
+typedef int64_t (*iFiippp_t)(int64_t, int64_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(gdk_init, vFpp_t) \
+	GO(gdk_init_check, iFpp_t) \
+	GO(gdk_event_handler_set, vFppp_t) \
+	GO(gdk_window_add_filter, vFppp_t) \
+	GO(gdk_window_remove_filter, vFppp_t) \
+	GO(gdk_input_add, iFiipp_t) \
+	GO(gdk_input_add_full, iFiippp_t)
+
+#endif // __wrappedgdk3TYPES_H_
diff --git a/src/wrapped/generated/wrappedgdk3undefs.h b/src/wrapped/generated/wrappedgdk3undefs.h
new file mode 100644
index 00000000..89837ac5
--- /dev/null
+++ b/src/wrapped/generated/wrappedgdk3undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.1.0.16) *
+ *******************************************************************/
+#ifndef __wrappedgdk3UNDEFS_H_
+#define __wrappedgdk3UNDEFS_H_
+
+
+#endif // __wrappedgdk3UNDEFS_H_
diff --git a/src/wrapped/generated/wrappedgtk3defs.h b/src/wrapped/generated/wrappedgtk3defs.h
new file mode 100644
index 00000000..4faf7cbd
--- /dev/null
+++ b/src/wrapped/generated/wrappedgtk3defs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.1.0.16) *
+ *******************************************************************/
+#ifndef __wrappedgtk3DEFS_H_
+#define __wrappedgtk3DEFS_H_
+
+
+#endif // __wrappedgtk3DEFS_H_
diff --git a/src/wrapped/generated/wrappedgtk3types.h b/src/wrapped/generated/wrappedgtk3types.h
new file mode 100644
index 00000000..32af8b70
--- /dev/null
+++ b/src/wrapped/generated/wrappedgtk3types.h
@@ -0,0 +1,69 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.1.0.16) *
+ *******************************************************************/
+#ifndef __wrappedgtk3TYPES_H_
+#define __wrappedgtk3TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFi_t)(int64_t);
+typedef void (*vFpp_t)(void*, void*);
+typedef int64_t (*iFLp_t)(uintptr_t, void*);
+typedef int64_t (*iFpp_t)(void*, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef void (*vFppV_t)(void*, void*, ...);
+typedef uint64_t (*uFupp_t)(uint64_t, void*, void*);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef int64_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef void (*vFpippp_t)(void*, int64_t, void*, void*, void*);
+typedef void (*vFppppp_t)(void*, void*, void*, void*, void*);
+typedef int64_t (*iFppuppp_t)(void*, void*, uint64_t, void*, void*, void*);
+typedef int64_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*);
+typedef void (*vFpppppuu_t)(void*, void*, void*, void*, void*, uint64_t, uint64_t);
+typedef void* (*pFppppppi_t)(void*, void*, void*, void*, void*, void*, int64_t);
+typedef void* (*pFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
+typedef uintptr_t (*LFppppppii_t)(void*, void*, void*, void*, void*, void*, int64_t, int64_t);
+typedef void* (*pFpppppppi_t)(void*, void*, void*, void*, void*, void*, void*, int64_t);
+typedef void* (*pFpippppppp_t)(void*, int64_t, void*, void*, void*, void*, void*, void*, void*);
+typedef void* (*pFpipppppppi_t)(void*, int64_t, void*, void*, void*, void*, void*, void*, void*, int64_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(gtk_type_class, pFi_t) \
+	GO(gtk_builder_connect_signals, vFpp_t) \
+	GO(gtk_init, vFpp_t) \
+	GO(gtk_type_unique, iFLp_t) \
+	GO(gtk_init_check, iFpp_t) \
+	GO(gtk_builder_connect_signals_full, vFppp_t) \
+	GO(gtk_container_forall, vFppp_t) \
+	GO(gtk_menu_attach_to_widget, vFppp_t) \
+	GO(gtk_dialog_add_buttons, vFppV_t) \
+	GO(gtk_message_dialog_format_secondary_markup, vFppV_t) \
+	GO(gtk_message_dialog_format_secondary_text, vFppV_t) \
+	GO(gtk_timeout_add, uFupp_t) \
+	GO(gtk_object_set_data_full, vFpppp_t) \
+	GO(gtk_stock_set_translate_func, vFpppp_t) \
+	GO(gtk_tree_sortable_set_default_sort_func, vFpppp_t) \
+	GO(gtk_tree_view_set_search_equal_func, vFpppp_t) \
+	GO(gtk_text_iter_backward_find_char, iFpppp_t) \
+	GO(gtk_text_iter_forward_find_char, iFpppp_t) \
+	GO(gtk_tree_sortable_set_sort_func, vFpippp_t) \
+	GO(gtk_tree_view_column_set_cell_data_func, vFppppp_t) \
+	GO(gtk_clipboard_set_with_data, iFppuppp_t) \
+	GO(gtk_clipboard_set_with_owner, iFppuppp_t) \
+	GO(gtk_init_with_args, iFpppppp_t) \
+	GO(gtk_menu_popup, vFpppppuu_t) \
+	GO(gtk_toolbar_insert_stock, pFppppppi_t) \
+	GO(gtk_toolbar_append_item, pFppppppp_t) \
+	GO(gtk_toolbar_prepend_item, pFppppppp_t) \
+	GO(gtk_signal_connect_full, LFppppppii_t) \
+	GO(gtk_toolbar_insert_item, pFpppppppi_t) \
+	GO(gtk_toolbar_append_element, pFpippppppp_t) \
+	GO(gtk_toolbar_prepend_element, pFpippppppp_t) \
+	GO(gtk_toolbar_insert_element, pFpipppppppi_t)
+
+#endif // __wrappedgtk3TYPES_H_
diff --git a/src/wrapped/generated/wrappedgtk3undefs.h b/src/wrapped/generated/wrappedgtk3undefs.h
new file mode 100644
index 00000000..13c55d1f
--- /dev/null
+++ b/src/wrapped/generated/wrappedgtk3undefs.h
@@ -0,0 +1,8 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v2.1.0.16) *
+ *******************************************************************/
+#ifndef __wrappedgtk3UNDEFS_H_
+#define __wrappedgtk3UNDEFS_H_
+
+
+#endif // __wrappedgtk3UNDEFS_H_
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index b7780da8..3bb9c270 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -264,10 +264,12 @@ typedef void* (*pFii_t)(int64_t, int64_t);
 typedef void* (*pFiI_t)(int64_t, int64_t);
 typedef void* (*pFiu_t)(int64_t, uint64_t);
 typedef void* (*pFip_t)(int64_t, void*);
+typedef void* (*pFiV_t)(int64_t, void*);
 typedef void* (*pFui_t)(uint64_t, int64_t);
 typedef void* (*pFuC_t)(uint64_t, uint8_t);
 typedef void* (*pFuu_t)(uint64_t, uint64_t);
 typedef void* (*pFup_t)(uint64_t, void*);
+typedef void* (*pFuV_t)(uint64_t, void*);
 typedef void* (*pFUi_t)(uint64_t, int64_t);
 typedef void* (*pFUU_t)(uint64_t, uint64_t);
 typedef void* (*pFdi_t)(double, int64_t);
@@ -331,6 +333,7 @@ typedef void (*vFfff_t)(float, float, float);
 typedef void (*vFfpp_t)(float, void*, void*);
 typedef void (*vFddd_t)(double, double, double);
 typedef void (*vFdpp_t)(double, void*, void*);
+typedef void (*vFLup_t)(uintptr_t, uint64_t, void*);
 typedef void (*vFLpL_t)(uintptr_t, void*, uintptr_t);
 typedef void (*vFLpp_t)(uintptr_t, void*, void*);
 typedef void (*vFpii_t)(void*, int64_t, int64_t);
@@ -369,6 +372,7 @@ typedef int64_t (*iFEip_t)(x64emu_t*, int64_t, void*);
 typedef int64_t (*iFEWW_t)(x64emu_t*, uint16_t, uint16_t);
 typedef int64_t (*iFEup_t)(x64emu_t*, uint64_t, void*);
 typedef int64_t (*iFEUU_t)(x64emu_t*, uint64_t, uint64_t);
+typedef int64_t (*iFELp_t)(x64emu_t*, uintptr_t, void*);
 typedef int64_t (*iFEpi_t)(x64emu_t*, void*, int64_t);
 typedef int64_t (*iFEpL_t)(x64emu_t*, void*, uintptr_t);
 typedef int64_t (*iFEpp_t)(x64emu_t*, void*, void*);
@@ -696,6 +700,7 @@ typedef void (*vFpLLL_t)(void*, uintptr_t, uintptr_t, uintptr_t);
 typedef void (*vFppii_t)(void*, void*, int64_t, int64_t);
 typedef void (*vFppiu_t)(void*, void*, int64_t, uint64_t);
 typedef void (*vFppid_t)(void*, void*, int64_t, double);
+typedef void (*vFppil_t)(void*, void*, int64_t, intptr_t);
 typedef void (*vFppiL_t)(void*, void*, int64_t, uintptr_t);
 typedef void (*vFppip_t)(void*, void*, int64_t, void*);
 typedef void (*vFppui_t)(void*, void*, uint64_t, int64_t);
@@ -1108,10 +1113,12 @@ typedef void (*vFppuuu_t)(void*, void*, uint64_t, uint64_t, uint64_t);
 typedef void (*vFppuup_t)(void*, void*, uint64_t, uint64_t, void*);
 typedef void (*vFppupi_t)(void*, void*, uint64_t, void*, int64_t);
 typedef void (*vFppupp_t)(void*, void*, uint64_t, void*, void*);
+typedef void (*vFppddp_t)(void*, void*, double, double, void*);
 typedef void (*vFpppii_t)(void*, void*, void*, int64_t, int64_t);
 typedef void (*vFpppip_t)(void*, void*, void*, int64_t, void*);
 typedef void (*vFpppuu_t)(void*, void*, void*, uint64_t, uint64_t);
 typedef void (*vFpppup_t)(void*, void*, void*, uint64_t, void*);
+typedef void (*vFpppdd_t)(void*, void*, void*, double, double);
 typedef void (*vFppppi_t)(void*, void*, void*, void*, int64_t);
 typedef void (*vFppppu_t)(void*, void*, void*, void*, uint64_t);
 typedef void (*vFppppL_t)(void*, void*, void*, void*, uintptr_t);
@@ -1379,6 +1386,7 @@ typedef void (*vFpiippp_t)(void*, int64_t, int64_t, void*, void*, void*);
 typedef void (*vFpiUuup_t)(void*, int64_t, uint64_t, uint64_t, uint64_t, void*);
 typedef void (*vFpipipV_t)(void*, int64_t, void*, int64_t, void*, void*);
 typedef void (*vFpipppi_t)(void*, int64_t, void*, void*, void*, int64_t);
+typedef void (*vFpipppp_t)(void*, int64_t, void*, void*, void*, void*);
 typedef void (*vFpuiiii_t)(void*, uint64_t, int64_t, int64_t, int64_t, int64_t);
 typedef void (*vFpuiiiu_t)(void*, uint64_t, int64_t, int64_t, int64_t, uint64_t);
 typedef void (*vFpuiipp_t)(void*, uint64_t, int64_t, int64_t, void*, void*);
@@ -1394,6 +1402,7 @@ typedef void (*vFpUipup_t)(void*, uint64_t, int64_t, void*, uint64_t, void*);
 typedef void (*vFpUUiup_t)(void*, uint64_t, uint64_t, int64_t, uint64_t, void*);
 typedef void (*vFpdddii_t)(void*, double, double, double, int64_t, int64_t);
 typedef void (*vFpddddd_t)(void*, double, double, double, double, double);
+typedef void (*vFpddddp_t)(void*, double, double, double, double, void*);
 typedef void (*vFppiiii_t)(void*, void*, int64_t, int64_t, int64_t, int64_t);
 typedef void (*vFppiiip_t)(void*, void*, int64_t, int64_t, int64_t, void*);
 typedef void (*vFppiiui_t)(void*, void*, int64_t, int64_t, uint64_t, int64_t);
@@ -1406,6 +1415,7 @@ typedef void (*vFppuuuu_t)(void*, void*, uint64_t, uint64_t, uint64_t, uint64_t)
 typedef void (*vFppupii_t)(void*, void*, uint64_t, void*, int64_t, int64_t);
 typedef void (*vFppuppp_t)(void*, void*, uint64_t, void*, void*, void*);
 typedef void (*vFppdidd_t)(void*, void*, double, int64_t, double, double);
+typedef void (*vFppdddd_t)(void*, void*, double, double, double, double);
 typedef void (*vFpplppi_t)(void*, void*, intptr_t, void*, void*, int64_t);
 typedef void (*vFpplppp_t)(void*, void*, intptr_t, void*, void*, void*);
 typedef void (*vFppLppi_t)(void*, void*, uintptr_t, void*, void*, int64_t);
@@ -1642,6 +1652,8 @@ typedef void (*vFppiLiLp_t)(void*, void*, int64_t, uintptr_t, int64_t, uintptr_t
 typedef void (*vFppipiip_t)(void*, void*, int64_t, void*, int64_t, int64_t, void*);
 typedef void (*vFppipipp_t)(void*, void*, int64_t, void*, int64_t, void*, void*);
 typedef void (*vFppipppp_t)(void*, void*, int64_t, void*, void*, void*, void*);
+typedef void (*vFppddddi_t)(void*, void*, double, double, double, double, int64_t);
+typedef void (*vFppddpii_t)(void*, void*, double, double, void*, int64_t, int64_t);
 typedef void (*vFppLpppi_t)(void*, void*, uintptr_t, void*, void*, void*, int64_t);
 typedef void (*vFppLpppp_t)(void*, void*, uintptr_t, void*, void*, void*, void*);
 typedef void (*vFpppiiii_t)(void*, void*, void*, int64_t, int64_t, int64_t, int64_t);
@@ -1919,6 +1931,7 @@ typedef void (*vFppipppiii_t)(void*, void*, int64_t, void*, void*, void*, int64_
 typedef void (*vFppipppiip_t)(void*, void*, int64_t, void*, void*, void*, int64_t, int64_t, void*);
 typedef void (*vFppuuiiiii_t)(void*, void*, uint64_t, uint64_t, int64_t, int64_t, int64_t, int64_t, int64_t);
 typedef void (*vFppUUiUUUU_t)(void*, void*, uint64_t, uint64_t, int64_t, uint64_t, uint64_t, uint64_t, uint64_t);
+typedef void (*vFppddddidd_t)(void*, void*, double, double, double, double, int64_t, double, double);
 typedef void (*vFpplpppppi_t)(void*, void*, intptr_t, void*, void*, void*, void*, void*, int64_t);
 typedef void (*vFpppiiiiii_t)(void*, void*, void*, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t);
 typedef void (*vFppppipiip_t)(void*, void*, void*, void*, int64_t, void*, int64_t, int64_t, void*);
@@ -2146,7 +2159,6 @@ typedef int64_t (*iFipiip_t)(int64_t, void*, int64_t, int64_t, void*);
 #endif
 
 #if !defined(NOALIGN)
-typedef int64_t (*iFELp_t)(x64emu_t*, uintptr_t, void*);
 typedef int64_t (*iFEppu_t)(x64emu_t*, void*, void*, uint64_t);
 typedef int64_t (*iFEiiip_t)(x64emu_t*, int64_t, int64_t, int64_t, void*);
 typedef int64_t (*iFEipii_t)(x64emu_t*, int64_t, void*, int64_t, int64_t);
@@ -2385,10 +2397,12 @@ void pFii(x64emu_t *emu, uintptr_t fcn) { pFii_t fn = (pFii_t)fcn; R_RAX=(uintpt
 void pFiI(x64emu_t *emu, uintptr_t fcn) { pFiI_t fn = (pFiI_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (int64_t)R_RSI); }
 void pFiu(x64emu_t *emu, uintptr_t fcn) { pFiu_t fn = (pFiu_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (uint64_t)R_RSI); }
 void pFip(x64emu_t *emu, uintptr_t fcn) { pFip_t fn = (pFip_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI); }
+void pFiV(x64emu_t *emu, uintptr_t fcn) { pFiV_t fn = (pFiV_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)(R_RSP + 8)); }
 void pFui(x64emu_t *emu, uintptr_t fcn) { pFui_t fn = (pFui_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (int64_t)R_RSI); }
 void pFuC(x64emu_t *emu, uintptr_t fcn) { pFuC_t fn = (pFuC_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (uint8_t)R_RSI); }
 void pFuu(x64emu_t *emu, uintptr_t fcn) { pFuu_t fn = (pFuu_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI); }
 void pFup(x64emu_t *emu, uintptr_t fcn) { pFup_t fn = (pFup_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (void*)R_RSI); }
+void pFuV(x64emu_t *emu, uintptr_t fcn) { pFuV_t fn = (pFuV_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (void*)(R_RSP + 8)); }
 void pFUi(x64emu_t *emu, uintptr_t fcn) { pFUi_t fn = (pFUi_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (int64_t)R_RSI); }
 void pFUU(x64emu_t *emu, uintptr_t fcn) { pFUU_t fn = (pFUU_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI); }
 void pFdi(x64emu_t *emu, uintptr_t fcn) { pFdi_t fn = (pFdi_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (int64_t)R_RDI); }
@@ -2452,6 +2466,7 @@ void vFfff(x64emu_t *emu, uintptr_t fcn) { vFfff_t fn = (vFfff_t)fcn; fn(emu->xm
 void vFfpp(x64emu_t *emu, uintptr_t fcn) { vFfpp_t fn = (vFfpp_t)fcn; fn(emu->xmm[0].f[0], (void*)R_RDI, (void*)R_RSI); }
 void vFddd(x64emu_t *emu, uintptr_t fcn) { vFddd_t fn = (vFddd_t)fcn; fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0]); }
 void vFdpp(x64emu_t *emu, uintptr_t fcn) { vFdpp_t fn = (vFdpp_t)fcn; fn(emu->xmm[0].d[0], (void*)R_RDI, (void*)R_RSI); }
+void vFLup(x64emu_t *emu, uintptr_t fcn) { vFLup_t fn = (vFLup_t)fcn; fn((uintptr_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX); }
 void vFLpL(x64emu_t *emu, uintptr_t fcn) { vFLpL_t fn = (vFLpL_t)fcn; fn((uintptr_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void vFLpp(x64emu_t *emu, uintptr_t fcn) { vFLpp_t fn = (vFLpp_t)fcn; fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void vFpii(x64emu_t *emu, uintptr_t fcn) { vFpii_t fn = (vFpii_t)fcn; fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX); }
@@ -2490,6 +2505,7 @@ void iFEip(x64emu_t *emu, uintptr_t fcn) { iFEip_t fn = (iFEip_t)fcn; R_RAX=(int
 void iFEWW(x64emu_t *emu, uintptr_t fcn) { iFEWW_t fn = (iFEWW_t)fcn; R_RAX=(int64_t)fn(emu, (uint16_t)R_RDI, (uint16_t)R_RSI); }
 void iFEup(x64emu_t *emu, uintptr_t fcn) { iFEup_t fn = (iFEup_t)fcn; R_RAX=(int64_t)fn(emu, (uint64_t)R_RDI, (void*)R_RSI); }
 void iFEUU(x64emu_t *emu, uintptr_t fcn) { iFEUU_t fn = (iFEUU_t)fcn; R_RAX=(int64_t)fn(emu, (uint64_t)R_RDI, (uint64_t)R_RSI); }
+void iFELp(x64emu_t *emu, uintptr_t fcn) { iFELp_t fn = (iFELp_t)fcn; R_RAX=(int64_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI); }
 void iFEpi(x64emu_t *emu, uintptr_t fcn) { iFEpi_t fn = (iFEpi_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI); }
 void iFEpL(x64emu_t *emu, uintptr_t fcn) { iFEpL_t fn = (iFEpL_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI); }
 void iFEpp(x64emu_t *emu, uintptr_t fcn) { iFEpp_t fn = (iFEpp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI); }
@@ -2817,6 +2833,7 @@ void vFpLLL(x64emu_t *emu, uintptr_t fcn) { vFpLLL_t fn = (vFpLLL_t)fcn; fn((voi
 void vFppii(x64emu_t *emu, uintptr_t fcn) { vFppii_t fn = (vFppii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
 void vFppiu(x64emu_t *emu, uintptr_t fcn) { vFppiu_t fn = (vFppiu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX); }
 void vFppid(x64emu_t *emu, uintptr_t fcn) { vFppid_t fn = (vFppid_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, emu->xmm[0].d[0]); }
+void vFppil(x64emu_t *emu, uintptr_t fcn) { vFppil_t fn = (vFppil_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (intptr_t)R_RCX); }
 void vFppiL(x64emu_t *emu, uintptr_t fcn) { vFppiL_t fn = (vFppiL_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (uintptr_t)R_RCX); }
 void vFppip(x64emu_t *emu, uintptr_t fcn) { vFppip_t fn = (vFppip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX); }
 void vFppui(x64emu_t *emu, uintptr_t fcn) { vFppui_t fn = (vFppui_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX); }
@@ -3229,10 +3246,12 @@ void vFppuuu(x64emu_t *emu, uintptr_t fcn) { vFppuuu_t fn = (vFppuuu_t)fcn; fn((
 void vFppuup(x64emu_t *emu, uintptr_t fcn) { vFppuup_t fn = (vFppuup_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (void*)R_R8); }
 void vFppupi(x64emu_t *emu, uintptr_t fcn) { vFppupi_t fn = (vFppupi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (int64_t)R_R8); }
 void vFppupp(x64emu_t *emu, uintptr_t fcn) { vFppupp_t fn = (vFppupp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void vFppddp(x64emu_t *emu, uintptr_t fcn) { vFppddp_t fn = (vFppddp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], (void*)R_RDX); }
 void vFpppii(x64emu_t *emu, uintptr_t fcn) { vFpppii_t fn = (vFpppii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
 void vFpppip(x64emu_t *emu, uintptr_t fcn) { vFpppip_t fn = (vFpppip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (void*)R_R8); }
 void vFpppuu(x64emu_t *emu, uintptr_t fcn) { vFpppuu_t fn = (vFpppuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8); }
 void vFpppup(x64emu_t *emu, uintptr_t fcn) { vFpppup_t fn = (vFpppup_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint64_t)R_RCX, (void*)R_R8); }
+void vFpppdd(x64emu_t *emu, uintptr_t fcn) { vFpppdd_t fn = (vFpppdd_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void vFppppi(x64emu_t *emu, uintptr_t fcn) { vFppppi_t fn = (vFppppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8); }
 void vFppppu(x64emu_t *emu, uintptr_t fcn) { vFppppu_t fn = (vFppppu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint64_t)R_R8); }
 void vFppppL(x64emu_t *emu, uintptr_t fcn) { vFppppL_t fn = (vFppppL_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
@@ -3500,6 +3519,7 @@ void vFpiippp(x64emu_t *emu, uintptr_t fcn) { vFpiippp_t fn = (vFpiippp_t)fcn; f
 void vFpiUuup(x64emu_t *emu, uintptr_t fcn) { vFpiUuup_t fn = (vFpiUuup_t)fcn; fn((void*)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (void*)R_R9); }
 void vFpipipV(x64emu_t *emu, uintptr_t fcn) { vFpipipV_t fn = (vFpipipV_t)fcn; fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (void*)R_R8, (void*)(R_RSP + 8)); }
 void vFpipppi(x64emu_t *emu, uintptr_t fcn) { vFpipppi_t fn = (vFpipppi_t)fcn; fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int64_t)R_R9); }
+void vFpipppp(x64emu_t *emu, uintptr_t fcn) { vFpipppp_t fn = (vFpipppp_t)fcn; fn((void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFpuiiii(x64emu_t *emu, uintptr_t fcn) { vFpuiiii_t fn = (vFpuiiii_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9); }
 void vFpuiiiu(x64emu_t *emu, uintptr_t fcn) { vFpuiiiu_t fn = (vFpuiiiu_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (uint64_t)R_R9); }
 void vFpuiipp(x64emu_t *emu, uintptr_t fcn) { vFpuiipp_t fn = (vFpuiipp_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -3515,6 +3535,7 @@ void vFpUipup(x64emu_t *emu, uintptr_t fcn) { vFpUipup_t fn = (vFpUipup_t)fcn; f
 void vFpUUiup(x64emu_t *emu, uintptr_t fcn) { vFpUUiup_t fn = (vFpUUiup_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8, (void*)R_R9); }
 void vFpdddii(x64emu_t *emu, uintptr_t fcn) { vFpdddii_t fn = (vFpdddii_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], (int64_t)R_RSI, (int64_t)R_RDX); }
 void vFpddddd(x64emu_t *emu, uintptr_t fcn) { vFpddddd_t fn = (vFpddddd_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], emu->xmm[4].d[0]); }
+void vFpddddp(x64emu_t *emu, uintptr_t fcn) { vFpddddp_t fn = (vFpddddp_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], (void*)R_RSI); }
 void vFppiiii(x64emu_t *emu, uintptr_t fcn) { vFppiiii_t fn = (vFppiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9); }
 void vFppiiip(x64emu_t *emu, uintptr_t fcn) { vFppiiip_t fn = (vFppiiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (void*)R_R9); }
 void vFppiiui(x64emu_t *emu, uintptr_t fcn) { vFppiiui_t fn = (vFppiiui_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8, (int64_t)R_R9); }
@@ -3527,6 +3548,7 @@ void vFppuuuu(x64emu_t *emu, uintptr_t fcn) { vFppuuuu_t fn = (vFppuuuu_t)fcn; f
 void vFppupii(x64emu_t *emu, uintptr_t fcn) { vFppupii_t fn = (vFppupii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (int64_t)R_R8, (int64_t)R_R9); }
 void vFppuppp(x64emu_t *emu, uintptr_t fcn) { vFppuppp_t fn = (vFppuppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFppdidd(x64emu_t *emu, uintptr_t fcn) { vFppdidd_t fn = (vFppdidd_t)fcn; fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], (int64_t)R_RDX, emu->xmm[1].d[0], emu->xmm[2].d[0]); }
+void vFppdddd(x64emu_t *emu, uintptr_t fcn) { vFppdddd_t fn = (vFppdddd_t)fcn; fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0]); }
 void vFpplppi(x64emu_t *emu, uintptr_t fcn) { vFpplppi_t fn = (vFpplppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int64_t)R_R9); }
 void vFpplppp(x64emu_t *emu, uintptr_t fcn) { vFpplppp_t fn = (vFpplppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFppLppi(x64emu_t *emu, uintptr_t fcn) { vFppLppi_t fn = (vFppLppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int64_t)R_R9); }
@@ -3763,6 +3785,8 @@ void vFppiLiLp(x64emu_t *emu, uintptr_t fcn) { vFppiLiLp_t fn = (vFppiLiLp_t)fcn
 void vFppipiip(x64emu_t *emu, uintptr_t fcn) { vFppipiip_t fn = (vFppipiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(void**)(R_RSP + 8)); }
 void vFppipipp(x64emu_t *emu, uintptr_t fcn) { vFppipipp_t fn = (vFppipipp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (int64_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFppipppp(x64emu_t *emu, uintptr_t fcn) { vFppipppp_t fn = (vFppipppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void vFppddddi(x64emu_t *emu, uintptr_t fcn) { vFppddddi_t fn = (vFppddddi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], (int64_t)R_RDX); }
+void vFppddpii(x64emu_t *emu, uintptr_t fcn) { vFppddpii_t fn = (vFppddpii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], (void*)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
 void vFppLpppi(x64emu_t *emu, uintptr_t fcn) { vFppLpppi_t fn = (vFppLpppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int64_t*)(R_RSP + 8)); }
 void vFppLpppp(x64emu_t *emu, uintptr_t fcn) { vFppLpppp_t fn = (vFppLpppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFpppiiii(x64emu_t *emu, uintptr_t fcn) { vFpppiiii_t fn = (vFpppiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8)); }
@@ -4040,6 +4064,7 @@ void vFppipppiii(x64emu_t *emu, uintptr_t fcn) { vFppipppiii_t fn = (vFppipppiii
 void vFppipppiip(x64emu_t *emu, uintptr_t fcn) { vFppipppiip_t fn = (vFppipppiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void vFppuuiiiii(x64emu_t *emu, uintptr_t fcn) { vFppuuiiiii_t fn = (vFppuuiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(int64_t*)(R_RSP + 24)); }
 void vFppUUiUUUU(x64emu_t *emu, uintptr_t fcn) { vFppUUiUUUU_t fn = (vFppUUiUUUU_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (int64_t)R_R8, (uint64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16), *(uint64_t*)(R_RSP + 24)); }
+void vFppddddidd(x64emu_t *emu, uintptr_t fcn) { vFppddddidd_t fn = (vFppddddidd_t)fcn; fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], (int64_t)R_RDX, emu->xmm[4].d[0], emu->xmm[5].d[0]); }
 void vFpplpppppi(x64emu_t *emu, uintptr_t fcn) { vFpplpppppi_t fn = (vFpplpppppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(int64_t*)(R_RSP + 24)); }
 void vFpppiiiiii(x64emu_t *emu, uintptr_t fcn) { vFpppiiiiii_t fn = (vFpppiiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(int64_t*)(R_RSP + 24)); }
 void vFppppipiip(x64emu_t *emu, uintptr_t fcn) { vFppppipiip_t fn = (vFppppipiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8, (void*)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
@@ -4267,7 +4292,6 @@ void iFipiip(x64emu_t *emu, uintptr_t fcn) { iFipiip_t fn = (iFipiip_t)fcn; R_RA
 #endif
 
 #if !defined(NOALIGN)
-void iFELp(x64emu_t *emu, uintptr_t fcn) { iFELp_t fn = (iFELp_t)fcn; R_RAX=(int64_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI); }
 void iFEppu(x64emu_t *emu, uintptr_t fcn) { iFEppu_t fn = (iFEppu_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX); }
 void iFEiiip(x64emu_t *emu, uintptr_t fcn) { iFEiiip_t fn = (iFEiiip_t)fcn; R_RAX=(int64_t)fn(emu, (int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX); }
 void iFEipii(x64emu_t *emu, uintptr_t fcn) { iFEipii_t fn = (iFEipii_t)fcn; R_RAX=(int64_t)fn(emu, (int64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
@@ -4543,6 +4567,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFfpp) return 2;
 	if (fun == &vFddd) return 4;
 	if (fun == &vFdpp) return 2;
+	if (fun == &vFLup) return 1;
 	if (fun == &vFLpL) return 1;
 	if (fun == &vFLpp) return 1;
 	if (fun == &vFpii) return 1;
@@ -4857,6 +4882,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFppii) return 1;
 	if (fun == &vFppiu) return 1;
 	if (fun == &vFppid) return 2;
+	if (fun == &vFppil) return 1;
 	if (fun == &vFppiL) return 1;
 	if (fun == &vFppip) return 1;
 	if (fun == &vFppui) return 1;
@@ -5207,10 +5233,12 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFppuup) return 1;
 	if (fun == &vFppupi) return 1;
 	if (fun == &vFppupp) return 1;
+	if (fun == &vFppddp) return 3;
 	if (fun == &vFpppii) return 1;
 	if (fun == &vFpppip) return 1;
 	if (fun == &vFpppuu) return 1;
 	if (fun == &vFpppup) return 1;
+	if (fun == &vFpppdd) return 3;
 	if (fun == &vFppppi) return 1;
 	if (fun == &vFppppu) return 1;
 	if (fun == &vFppppL) return 1;
@@ -5428,6 +5456,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpiippp) return 1;
 	if (fun == &vFpiUuup) return 1;
 	if (fun == &vFpipppi) return 1;
+	if (fun == &vFpipppp) return 1;
 	if (fun == &vFpuiiii) return 1;
 	if (fun == &vFpuiiiu) return 1;
 	if (fun == &vFpuiipp) return 1;
@@ -5443,6 +5472,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpUUiup) return 1;
 	if (fun == &vFpdddii) return 4;
 	if (fun == &vFpddddd) return 6;
+	if (fun == &vFpddddp) return 5;
 	if (fun == &vFppiiii) return 1;
 	if (fun == &vFppiiip) return 1;
 	if (fun == &vFppiiui) return 1;
@@ -5455,6 +5485,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFppupii) return 1;
 	if (fun == &vFppuppp) return 1;
 	if (fun == &vFppdidd) return 4;
+	if (fun == &vFppdddd) return 5;
 	if (fun == &vFpplppi) return 1;
 	if (fun == &vFpplppp) return 1;
 	if (fun == &vFppLppi) return 1;
@@ -5599,6 +5630,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFudddddd) return 7;
 	if (fun == &vFpddiidd) return 5;
 	if (fun == &vFpdddddd) return 7;
+	if (fun == &vFppddddi) return 5;
+	if (fun == &vFppddpii) return 3;
 	if (fun == &iFppppdpi) return 2;
 	if (fun == &pFifffppp) return 4;
 	if (fun == &pFdiiiIiI) return 2;
@@ -5609,6 +5642,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFffffffff) return 9;
 	if (fun == &vFuffffffff) return 9;
 	if (fun == &vFffuuuufff) return 6;
+	if (fun == &vFppddddidd) return 7;
 	if (fun == &iFdddpppppp) return 4;
 	if (fun == &vFuffiiffiip) return 5;
 	if (fun == &vFuddiiddiip) return 5;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 59908a09..5d8b6b5b 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -263,10 +263,12 @@ void pFii(x64emu_t *emu, uintptr_t fnc);
 void pFiI(x64emu_t *emu, uintptr_t fnc);
 void pFiu(x64emu_t *emu, uintptr_t fnc);
 void pFip(x64emu_t *emu, uintptr_t fnc);
+void pFiV(x64emu_t *emu, uintptr_t fnc);
 void pFui(x64emu_t *emu, uintptr_t fnc);
 void pFuC(x64emu_t *emu, uintptr_t fnc);
 void pFuu(x64emu_t *emu, uintptr_t fnc);
 void pFup(x64emu_t *emu, uintptr_t fnc);
+void pFuV(x64emu_t *emu, uintptr_t fnc);
 void pFUi(x64emu_t *emu, uintptr_t fnc);
 void pFUU(x64emu_t *emu, uintptr_t fnc);
 void pFdi(x64emu_t *emu, uintptr_t fnc);
@@ -330,6 +332,7 @@ void vFfff(x64emu_t *emu, uintptr_t fnc);
 void vFfpp(x64emu_t *emu, uintptr_t fnc);
 void vFddd(x64emu_t *emu, uintptr_t fnc);
 void vFdpp(x64emu_t *emu, uintptr_t fnc);
+void vFLup(x64emu_t *emu, uintptr_t fnc);
 void vFLpL(x64emu_t *emu, uintptr_t fnc);
 void vFLpp(x64emu_t *emu, uintptr_t fnc);
 void vFpii(x64emu_t *emu, uintptr_t fnc);
@@ -368,6 +371,7 @@ void iFEip(x64emu_t *emu, uintptr_t fnc);
 void iFEWW(x64emu_t *emu, uintptr_t fnc);
 void iFEup(x64emu_t *emu, uintptr_t fnc);
 void iFEUU(x64emu_t *emu, uintptr_t fnc);
+void iFELp(x64emu_t *emu, uintptr_t fnc);
 void iFEpi(x64emu_t *emu, uintptr_t fnc);
 void iFEpL(x64emu_t *emu, uintptr_t fnc);
 void iFEpp(x64emu_t *emu, uintptr_t fnc);
@@ -695,6 +699,7 @@ void vFpLLL(x64emu_t *emu, uintptr_t fnc);
 void vFppii(x64emu_t *emu, uintptr_t fnc);
 void vFppiu(x64emu_t *emu, uintptr_t fnc);
 void vFppid(x64emu_t *emu, uintptr_t fnc);
+void vFppil(x64emu_t *emu, uintptr_t fnc);
 void vFppiL(x64emu_t *emu, uintptr_t fnc);
 void vFppip(x64emu_t *emu, uintptr_t fnc);
 void vFppui(x64emu_t *emu, uintptr_t fnc);
@@ -1107,10 +1112,12 @@ void vFppuuu(x64emu_t *emu, uintptr_t fnc);
 void vFppuup(x64emu_t *emu, uintptr_t fnc);
 void vFppupi(x64emu_t *emu, uintptr_t fnc);
 void vFppupp(x64emu_t *emu, uintptr_t fnc);
+void vFppddp(x64emu_t *emu, uintptr_t fnc);
 void vFpppii(x64emu_t *emu, uintptr_t fnc);
 void vFpppip(x64emu_t *emu, uintptr_t fnc);
 void vFpppuu(x64emu_t *emu, uintptr_t fnc);
 void vFpppup(x64emu_t *emu, uintptr_t fnc);
+void vFpppdd(x64emu_t *emu, uintptr_t fnc);
 void vFppppi(x64emu_t *emu, uintptr_t fnc);
 void vFppppu(x64emu_t *emu, uintptr_t fnc);
 void vFppppL(x64emu_t *emu, uintptr_t fnc);
@@ -1378,6 +1385,7 @@ void vFpiippp(x64emu_t *emu, uintptr_t fnc);
 void vFpiUuup(x64emu_t *emu, uintptr_t fnc);
 void vFpipipV(x64emu_t *emu, uintptr_t fnc);
 void vFpipppi(x64emu_t *emu, uintptr_t fnc);
+void vFpipppp(x64emu_t *emu, uintptr_t fnc);
 void vFpuiiii(x64emu_t *emu, uintptr_t fnc);
 void vFpuiiiu(x64emu_t *emu, uintptr_t fnc);
 void vFpuiipp(x64emu_t *emu, uintptr_t fnc);
@@ -1393,6 +1401,7 @@ void vFpUipup(x64emu_t *emu, uintptr_t fnc);
 void vFpUUiup(x64emu_t *emu, uintptr_t fnc);
 void vFpdddii(x64emu_t *emu, uintptr_t fnc);
 void vFpddddd(x64emu_t *emu, uintptr_t fnc);
+void vFpddddp(x64emu_t *emu, uintptr_t fnc);
 void vFppiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiip(x64emu_t *emu, uintptr_t fnc);
 void vFppiiui(x64emu_t *emu, uintptr_t fnc);
@@ -1405,6 +1414,7 @@ void vFppuuuu(x64emu_t *emu, uintptr_t fnc);
 void vFppupii(x64emu_t *emu, uintptr_t fnc);
 void vFppuppp(x64emu_t *emu, uintptr_t fnc);
 void vFppdidd(x64emu_t *emu, uintptr_t fnc);
+void vFppdddd(x64emu_t *emu, uintptr_t fnc);
 void vFpplppi(x64emu_t *emu, uintptr_t fnc);
 void vFpplppp(x64emu_t *emu, uintptr_t fnc);
 void vFppLppi(x64emu_t *emu, uintptr_t fnc);
@@ -1641,6 +1651,8 @@ void vFppiLiLp(x64emu_t *emu, uintptr_t fnc);
 void vFppipiip(x64emu_t *emu, uintptr_t fnc);
 void vFppipipp(x64emu_t *emu, uintptr_t fnc);
 void vFppipppp(x64emu_t *emu, uintptr_t fnc);
+void vFppddddi(x64emu_t *emu, uintptr_t fnc);
+void vFppddpii(x64emu_t *emu, uintptr_t fnc);
 void vFppLpppi(x64emu_t *emu, uintptr_t fnc);
 void vFppLpppp(x64emu_t *emu, uintptr_t fnc);
 void vFpppiiii(x64emu_t *emu, uintptr_t fnc);
@@ -1918,6 +1930,7 @@ void vFppipppiii(x64emu_t *emu, uintptr_t fnc);
 void vFppipppiip(x64emu_t *emu, uintptr_t fnc);
 void vFppuuiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppUUiUUUU(x64emu_t *emu, uintptr_t fnc);
+void vFppddddidd(x64emu_t *emu, uintptr_t fnc);
 void vFpplpppppi(x64emu_t *emu, uintptr_t fnc);
 void vFpppiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppppipiip(x64emu_t *emu, uintptr_t fnc);
@@ -2145,7 +2158,6 @@ void iFipiip(x64emu_t *emu, uintptr_t fnc);
 #endif
 
 #if !defined(NOALIGN)
-void iFELp(x64emu_t *emu, uintptr_t fnc);
 void iFEppu(x64emu_t *emu, uintptr_t fnc);
 void iFEiiip(x64emu_t *emu, uintptr_t fnc);
 void iFEipii(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedgdk3.c b/src/wrapped/wrappedgdk3.c
new file mode 100755
index 00000000..3e9899e0
--- /dev/null
+++ b/src/wrapped/wrappedgdk3.c
@@ -0,0 +1,140 @@
+#define _GNU_SOURCE         /* See feature_test_macros(7) */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dlfcn.h>
+
+#include "wrappedlibs.h"
+
+#include "debug.h"
+#include "wrapper.h"
+#include "bridge.h"
+#include "librarian/library_private.h"
+#include "x64emu.h"
+#include "emu/x64emu_private.h"
+#include "callback.h"
+#include "librarian.h"
+#include "box64context.h"
+#include "emu/x64emu_private.h"
+#include "gtkclass.h"
+
+const char* gdk3Name = "libgdk-3.so.0";
+#define LIBNAME gdk3
+
+static char* libname = NULL;
+
+//#define ADDED_FUNCTIONS()           \
+
+#include "generated/wrappedgdk3types.h"
+
+#include "wrappercallback.h"
+
+#define SUPER() \
+GO(0)   \
+GO(1)   \
+GO(2)   \
+GO(3)
+
+// GdkFilterFunc
+#define GO(A)   \
+static uintptr_t my_filter_fct_##A = 0;   \
+static int my_filter_##A(void* xevent, void* event, void* data)     \
+{                                       \
+    return (int)RunFunction(my_context, my_filter_fct_##A, 3, xevent, event, data);\
+}
+SUPER()
+#undef GO
+static void* findFilterFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_filter_fct_##A == (uintptr_t)fct) return my_filter_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_filter_fct_##A == 0) {my_filter_fct_##A = (uintptr_t)fct; return my_filter_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gtk-2 GdkFilterFunc callback\n");
+    return NULL;
+}
+
+
+static void my3_event_handler(void* event, my_signal_t* sig)
+{
+    RunFunction(my_context, sig->c_handler, 2, event, sig->data);
+}
+
+EXPORT void my3_gdk_event_handler_set(x64emu_t* emu, void* func, void* data, void* notify)
+{
+    if(!func)
+        return my->gdk_event_handler_set(func, data, notify);
+
+    my_signal_t* sig = new_mysignal(func, data, notify);
+    my->gdk_event_handler_set(my3_event_handler, sig, my_signal_delete);
+}
+
+
+static void my3_input_function(my_signal_t* sig, int source, int condition)
+{
+    RunFunction(my_context, sig->c_handler, 3, sig->data, source, condition);
+}
+
+EXPORT int my3_gdk_input_add(x64emu_t* emu, int source, int condition, void* f, void* data)
+{
+    if(!f)
+        return my->gdk_input_add_full(source, condition, f, data, NULL);
+
+    my_signal_t* sig = new_mysignal(f, data, NULL);
+    return my->gdk_input_add_full(source, condition, my3_input_function, sig, my_signal_delete);
+}
+
+EXPORT int my3_gdk_input_add_full(x64emu_t* emu, int source, int condition, void* f, void* data, void* notify)
+{
+    if(!f)
+        return my->gdk_input_add_full(source, condition, f, data, notify);
+    
+    my_signal_t* sig = new_mysignal(f, data, notify);
+    return my->gdk_input_add_full(source, condition, my3_input_function, sig, my_signal_delete);
+}
+
+EXPORT void my3_gdk_init(x64emu_t* emu, void* argc, void* argv)
+{
+    my->gdk_init(argc, argv);
+    my_checkGlobalGdkDisplay();
+}
+
+EXPORT int my3_gdk_init_check(x64emu_t* emu, void* argc, void* argv)
+{
+    int ret = my->gdk_init_check(argc, argv);
+    my_checkGlobalGdkDisplay();
+    return ret;
+}
+
+EXPORT void my3_gdk_window_add_filter(x64emu_t* emu, void* window, void* f, void* data)
+{
+    my->gdk_window_add_filter(window, findFilterFct(f), data);
+}
+
+EXPORT void my3_gdk_window_remove_filter(x64emu_t* emu, void* window, void* f, void* data)
+{
+    my->gdk_window_remove_filter(window, findFilterFct(f), data);
+}
+
+#define PRE_INIT    \
+    if(box64_nogtk) \
+        return -1;
+
+#define CUSTOM_INIT \
+    libname = lib->name;            \
+    SETALT(my3_);                   \
+    getMy(lib);                     \
+    setNeededLibs(lib, 3,           \
+        "libgobject-2.0.so.0",      \
+        "libgio-2.0.so.0",          \
+        "libgdk_pixbuf-2.0.so.0");
+
+#define CUSTOM_FINI \
+    freeMy();
+
+
+#include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedgdk3_private.h b/src/wrapped/wrappedgdk3_private.h
new file mode 100755
index 00000000..070d7aca
--- /dev/null
+++ b/src/wrapped/wrappedgdk3_private.h
@@ -0,0 +1,798 @@
+#if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
+#error meh!
+#endif
+
+//GOM(gdk_add_client_message_filter, vFpBp)
+//GO(gdk_add_option_entries_libgtk_only, 
+//GO(gdk_app_launch_context_get_type, 
+//GO(gdk_app_launch_context_new, 
+//GO(gdk_app_launch_context_set_desktop, 
+//GO(gdk_app_launch_context_set_display, 
+//GO(gdk_app_launch_context_set_icon, 
+//GO(gdk_app_launch_context_set_icon_name, 
+//GO(gdk_app_launch_context_set_screen, 
+//GO(gdk_app_launch_context_set_timestamp, 
+GO(gdk_atom_intern, pFpi)
+GO(gdk_atom_intern_static_string, pFp)
+GO(gdk_atom_name, pFp)
+GO(gdk_axis_use_get_type, iFv)
+GO(gdk_beep, vFv)
+GO(gdk_bitmap_create_from_data, pFppii)
+GO(gdk_byte_order_get_type, iFv)
+GO(gdk_cairo_create, pFp)
+GO(gdk_cairo_draw_from_gl, vFppiiiiiii)
+GO(gdk_cairo_get_clip_rectangle, iFpp)
+GO(gdk_cairo_get_drawing_context, pFp)
+GO(gdk_cairo_rectangle, vFpp)
+GO(gdk_cairo_region, vFpp)
+GO(gdk_cairo_region_create_from_surface, pFp)
+GO(gdk_cairo_reset_clip, vFpp)
+GO(gdk_cairo_set_source_color, vFpp)
+GO(gdk_cairo_set_source_pixbuf, vFppdd)
+GO(gdk_cairo_set_source_pixmap, vFppdd)
+GO(gdk_cairo_set_source_rgba, vFpp)
+GO(gdk_cairo_set_source_window, vFppdd)
+GO(gdk_cairo_surface_create_from_pixbuf, pFpip)
+//GO(gdk_cap_style_get_type, 
+//GO(gdk_char_height, 
+//GO(gdk_char_measure, 
+//GO(gdk_char_width, 
+//GO(gdk_char_width_wc, 
+GO(gdk_color_alloc, iFpp)
+GO(gdk_color_black, iFpp)
+GO(gdk_color_change, iFpp)
+GO(gdk_color_copy, pFp)
+GO(gdk_color_equal, iFpp)
+GO(gdk_color_free, vFp)
+GO(gdk_color_get_type, iFv)
+GO(gdk_color_hash, uFp)
+GO(gdk_colormap_alloc_color, iFppii)
+GO(gdk_colormap_alloc_colors, iFppiiip)
+GO(gdk_colormap_change, vFpi)
+GO(gdk_colormap_free_colors, vFppi)
+GO(gdk_colormap_get_screen, pFp)
+GO(gdk_colormap_get_system, pFv)
+GO(gdk_colormap_get_system_size, iFv)
+GO(gdk_colormap_get_type, iFv)
+GO(gdk_colormap_get_visual, pFp)
+GO(gdk_colormap_new, pFpi)
+GO(gdk_colormap_query_color, vFpLp)
+GO(gdk_colormap_ref, pFp)
+GO(gdk_colormap_unref, vFp)
+GO(gdk_color_parse, iFpp)
+GO(gdk_colors_alloc, iFpipipi)
+GO(gdk_colors_free, vFppiL)
+GO(gdk_colors_store, vFppi)
+GO(gdk_color_to_string, pFp)
+GO(gdk_color_white, iFpp)
+GO(gdk_crossing_mode_get_type, iFv)
+GO(gdk_cursor_get_cursor_type, iFp)
+GO(gdk_cursor_get_display, pFp)
+GO(gdk_cursor_get_image, pFp)
+GO(gdk_cursor_get_type, iFv)
+GO(gdk_cursor_new, pFi)
+GO(gdk_cursor_new_for_display, pFpi)
+GO(gdk_cursor_new_from_name, pFpp)
+GO(gdk_cursor_new_from_pixbuf, pFppii)
+GO(gdk_cursor_new_from_pixmap, pFppppii)
+GO(gdk_cursor_ref, pFp)
+GO(gdk_cursor_type_get_type, iFv)
+GO(gdk_cursor_unref, vFp)
+GO(gdk_device_free_history, vFpi)
+GO(gdk_device_get_axis, iFppip)
+GO(gdk_device_get_axis_use, iFpu)
+GO(gdk_device_get_core_pointer, pFv)
+GO(gdk_device_get_has_cursor, iFp)
+GO(gdk_device_get_history, iFppuupp)
+GO(gdk_device_get_key, vFpupp)
+GO(gdk_device_get_mode, iFp)
+GO(gdk_device_get_name, pFp)
+GO(gdk_device_get_n_axes, iFp)
+GO(gdk_device_get_n_keys, iFp)
+GO(gdk_device_get_source, iFp)
+GO(gdk_device_get_state, vFpppp)
+GO(gdk_device_get_type, iFv)
+GO(gdk_device_set_axis_use, vFpui)
+GO(gdk_device_set_key, vFpuui)
+GO(gdk_device_set_mode, iFpi)
+GO(gdk_device_set_source, vFpi)
+GO(gdk_devices_list, pFv)
+//GOM(gdk_display_add_client_message_filter, vFEpppp)
+GO(gdk_display_beep, vFp)
+GO(gdk_display_close, vFp)
+GO(gdk_display_flush, vFp)
+GO(gdk_display_get_core_pointer, pFp)
+GO(gdk_display_get_default, pFv)
+GO(gdk_display_get_default_cursor_size, uFp)
+GO(gdk_display_get_default_group, pFp)
+GO(gdk_display_get_default_screen, pFp)
+GO(gdk_display_get_event, pFp)
+GO(gdk_display_get_maximal_cursor_size, vFppp)
+GO(gdk_display_get_name, pFp)
+GO(gdk_display_get_n_screens, iFp)
+GO(gdk_display_get_pointer, vFppppp)
+GO(gdk_display_get_screen, pFpi)
+GO(gdk_display_get_type, iFv)
+GO(gdk_display_get_window_at_pointer, pFppp)
+GO(gdk_display_is_closed, iFp)
+GO(gdk_display_keyboard_ungrab, vFpu)
+GO(gdk_display_list_devices, pFp)
+GO(gdk_display_manager_get, pFv)
+GO(gdk_display_manager_get_default_display, pFp)
+GO(gdk_display_manager_get_type, iFv)
+GO(gdk_display_manager_list_displays, pFp)
+GO(gdk_display_manager_set_default_display, vFpp)
+GO(gdk_display_open, pFp)
+//GO(gdk_display_open_default_libgtk_only, 
+GO(gdk_display_peek_event, pFp)
+GO(gdk_display_pointer_is_grabbed, iFp)
+GO(gdk_display_pointer_ungrab, vFpu)
+GO(gdk_display_put_event, vFpp)
+GO(gdk_display_request_selection_notification, iFpp)
+GO(gdk_display_set_double_click_distance, vFpu)
+GO(gdk_display_set_double_click_time, vFpu)
+//GOM(gdk_display_set_pointer_hooks, pFEpp)     // GdkDisplayPointerHooks needs wrapping
+GO(gdk_display_store_clipboard, vFppupi)
+GO(gdk_display_supports_clipboard_persistence, iFp)
+GO(gdk_display_supports_composite, iFp)
+GO(gdk_display_supports_cursor_alpha, iFp)
+GO(gdk_display_supports_cursor_color, iFp)
+GO(gdk_display_supports_input_shapes, iFp)
+GO(gdk_display_supports_selection_notification, iFp)
+GO(gdk_display_supports_shapes, iFp)
+GO(gdk_display_sync, vFp)
+GO(gdk_display_warp_pointer, vFppii)
+GO(gdk_drag_abort, vFpu)
+GO(gdk_drag_action_get_type, iFv)
+GO(gdk_drag_begin, pFpp)
+GO(gdk_drag_context_get_actions, iFp)
+GO(gdk_drag_context_get_dest_window, pFp)
+GO(gdk_drag_context_get_protocol, iFp)
+GO(gdk_drag_context_get_selected_action, iFp)
+GO(gdk_drag_context_get_source_window, pFp)
+GO(gdk_drag_context_get_suggested_action, iFp)
+GO(gdk_drag_context_get_type, iFv)
+GO(gdk_drag_context_list_targets, pFp)
+GO(gdk_drag_context_new, pFv)
+GO(gdk_drag_context_ref, vFp)
+GO(gdk_drag_context_unref, vFp)
+GO(gdk_drag_drop, vFpu)
+GO(gdk_drag_drop_succeeded, iFp)
+GO(gdk_drag_find_window, vFppiipp)
+GO(gdk_drag_find_window_for_screen, vFpppiipp)
+GO(gdk_drag_get_protocol, pFpp)
+GO(gdk_drag_get_protocol_for_display, pFppp)
+GO(gdk_drag_get_selection, pFp)
+GO(gdk_drag_motion, iFppiiiiiu)
+GO(gdk_drag_protocol_get_type, iFv)
+GO(gdk_drag_status, vFpiu)
+GO(gdk_drawable_copy_to_image, pFppiiiiii)
+GO(gdk_drawable_get_clip_region, pFp)
+GO(gdk_drawable_get_colormap, pFp)
+GO(gdk_drawable_get_data, pFpp)
+GO(gdk_drawable_get_depth, iFp)
+GO(gdk_drawable_get_display, pFp)
+GO(gdk_drawable_get_image, pFpiiii)
+GO(gdk_drawable_get_screen, pFp)
+GO(gdk_drawable_get_size, vFppp)
+GO(gdk_drawable_get_type, iFv)
+GO(gdk_drawable_get_visible_region, pFp)
+GO(gdk_drawable_get_visual, pFp)
+GO(gdk_drawable_ref, pFp)
+GO(gdk_drawable_set_colormap, vFpp)
+//GOM(gdk_drawable_set_data, vFEpppB)
+GO(gdk_drawable_unref, vFp)
+GO(gdk_draw_arc, vFppiiiiiii)
+GO(gdk_draw_drawable, vFpppiiiiii)
+GO(gdk_draw_glyphs, vFpppiip)
+GO(gdk_draw_glyphs_transformed, vFppppiip)
+GO(gdk_draw_gray_image, vFppiiiiipi)
+GO(gdk_draw_image, vFpppiiiiii)
+GO(gdk_draw_indexed_image, vFppiiiiipip)
+GO(gdk_draw_layout, vFppiip)
+GO(gdk_draw_layout_line, vFppiip)
+GO(gdk_draw_layout_line_with_colors, vFppiippp)
+GO(gdk_draw_layout_with_colors, vFppiippp)
+GO(gdk_draw_line, vFppiiii)
+GO(gdk_draw_lines, vFpppi)
+GO(gdk_draw_pixbuf, vFpppiiiiiiiii)
+GO(gdk_draw_point, vFppii)
+GO(gdk_draw_points, vFpppi)
+GO(gdk_draw_polygon, vFppipi)
+GO(gdk_draw_rectangle, vFppiiiii)
+GO(gdk_draw_rgb_32_image, vFppiiiiipi)
+GO(gdk_draw_rgb_32_image_dithalign, vFppiiiiipiii)
+GO(gdk_draw_rgb_image, vFppiiiiipi)
+GO(gdk_draw_rgb_image_dithalign, vFppiiiiipiii)
+GO(gdk_draw_segments, vFpppi)
+GO(gdk_draw_string, vFpppiip)
+GO(gdk_draw_text, vFpppiipi)
+GO(gdk_draw_text_wc, vFpppiipi)
+GO(gdk_draw_trapezoids, vFpppi)
+GO(gdk_drop_finish, vFpiu)
+GO(gdk_drop_reply, vFpiu)
+GO(gdk_error_trap_pop, iFv)
+GO(gdk_error_trap_push, vFv)
+GO(gdk_event_copy, pFp)
+GO(gdk_event_free, vFp)
+GO(gdk_event_get, pFv)
+GO(gdk_event_get_axis, iFpip)
+GO(gdk_event_get_coords, iFppp)
+GO(gdk_event_get_graphics_expose, pFp)
+GO(gdk_event_get_root_coords, iFppp)
+GO(gdk_event_get_screen, pFp)
+GO(gdk_event_get_state, iFpp)
+GO(gdk_event_get_time, uFp)
+GO(gdk_event_get_type, iFv)
+GOM(gdk_event_handler_set, vFEppp)
+GO(gdk_event_mask_get_type, iFv)
+GO(gdk_event_new, pFi)
+GO(gdk_event_peek, pFv)
+GO(gdk_event_put, vFp)
+GO(gdk_event_request_motions, vFp)
+GO(gdk_event_send_client_message, iFpp)
+GO(gdk_event_send_client_message_for_display, iFppp)
+GO(gdk_event_send_clientmessage_toall, vFp)
+GO(gdk_event_set_screen, vFpp)
+GO(gdk_events_pending, iFv)
+//GO(gdk_event_type_get_type, 
+GO(gdk_exit, vFi)
+//GO(gdk_extension_mode_get_type, 
+//GO(gdk_fill_get_type, 
+//GO(gdk_fill_rule_get_type, 
+//GO(gdk_filter_return_get_type, 
+GO(gdk_flush, vFv)
+//GO(gdk_font_equal, 
+//GO(gdk_font_from_description, 
+//GO(gdk_font_from_description_for_display, 
+//GO(gdk_font_get_display, 
+GO(gdk_font_get_type, iFv)
+//GO(gdk_font_id, 
+//GO(gdk_font_load, 
+//GO(gdk_font_load_for_display, 
+//GO(gdk_font_ref, 
+//GO(gdk_fontset_load, 
+//GO(gdk_fontset_load_for_display, 
+//GO(gdk_font_type_get_type, 
+//GO(gdk_font_unref, 
+GO(gdk_free_compound_text, vFp)
+GO(gdk_free_text_list, vFp)
+GO(gdk_function_get_type, iFv)
+GO(gdk_gc_copy, vFpp)
+GO(gdk_gc_get_colormap, pFp)
+GO(gdk_gc_get_screen, pFp)
+GO(gdk_gc_get_type, iFv)
+GO(gdk_gc_get_values, vFpp)
+GO(gdk_gc_new, pFp)
+GO(gdk_gc_new_with_values, pFppu)
+GO(gdk_gc_offset, vFpii)
+GO(gdk_gc_ref, pFp)
+GO(gdk_gc_set_background, vFpp)
+GO(gdk_gc_set_clip_mask, vFpp)
+GO(gdk_gc_set_clip_origin, vFpii)
+GO(gdk_gc_set_clip_rectangle, vFpp)
+GO(gdk_gc_set_clip_region, vFpp)
+GO(gdk_gc_set_colormap, vFpp)
+GO(gdk_gc_set_dashes, vFpipi)
+GO(gdk_gc_set_exposures, vFpi)
+GO(gdk_gc_set_fill, vFpi)
+GO(gdk_gc_set_font, vFpp)
+GO(gdk_gc_set_foreground, vFpp)
+GO(gdk_gc_set_function,vFpi) 
+GO(gdk_gc_set_line_attributes, vFpiiii)
+GO(gdk_gc_set_rgb_bg_color, vFpp)
+GO(gdk_gc_set_rgb_fg_color, vFpp)
+GO(gdk_gc_set_stipple, vFpp)
+GO(gdk_gc_set_subwindow, vFpi)
+GO(gdk_gc_set_tile, vFpp)
+GO(gdk_gc_set_ts_origin, vFpii)
+GO(gdk_gc_set_values, vFppu)
+GO(gdk_gc_unref, vFp)
+GO(gdk_gc_values_mask_get_type, iFv)
+GO(gdk_get_default_root_window, pFv)
+GO(gdk_get_display, pFv)
+GO(gdk_get_display_arg_name, pFv)
+GO(gdk_get_program_class, pFv)
+GO(gdk_get_show_events, iFv)
+GO(gdk_get_use_xshm, iFv)
+GO(gdk_grab_status_get_type, iFv)
+GO(gdk_gravity_get_type, iFv)
+GO(gdk_image_get, pFpiiii)
+GO(gdk_image_get_bits_per_pixel, WFp)
+GO(gdk_image_get_byte_order, iFp)
+GO(gdk_image_get_bytes_per_line, WFp)
+GO(gdk_image_get_bytes_per_pixel, WFp)
+GO(gdk_image_get_colormap, pFp)
+GO(gdk_image_get_depth, WFp)
+GO(gdk_image_get_height, iFp)
+GO(gdk_image_get_image_type, iFp)
+GO(gdk_image_get_pixel, uFpii)
+GO(gdk_image_get_pixels, pFp)
+GO(gdk_image_get_type, iFv)
+GO(gdk_image_get_visual, pFp)
+GO(gdk_image_get_width, iFp)
+GO(gdk_image_new, pFipii)
+GO(gdk_image_new_bitmap, pFppii)
+GO(gdk_image_put_pixel, vFpiiu)
+GO(gdk_image_ref, pFp)
+GO(gdk_image_set_colormap, vFpp)
+GO(gdk_image_type_get_type, iFv)
+GO(gdk_image_unref, vFp)
+GOM(gdk_init, vFEpp)
+GOM(gdk_init_check, iFEpp)
+GOM(gdk_input_add, iFEiipp)
+GOM(gdk_input_add_full, iFEiippp)
+GO(gdk_input_condition_get_type, iFv)
+GO(gdk_input_mode_get_type, iFv)
+GO(gdk_input_remove, vFi)
+GO(gdk_input_set_extension_events, vFpii)
+GO(gdk_input_source_get_type, iFv)
+GO(gdk_join_style_get_type, iFv)
+GO(gdk_keyboard_grab, iFpiu)
+//GO(gdk_keyboard_grab_info_libgtk_only, 
+GO(gdk_keyboard_ungrab, vFu)
+GO(gdk_keymap_add_virtual_modifiers, vFpp)
+GO(gdk_keymap_get_caps_lock_state, iFp)
+GO(gdk_keymap_get_default, pFv)
+GO(gdk_keymap_get_direction, iFp)
+GO(gdk_keymap_get_entries_for_keycode, iFpuppp)
+GO(gdk_keymap_get_entries_for_keyval, iFpupp)
+GO(gdk_keymap_get_for_display, pFp)
+GO(gdk_keymap_get_type, iFv)
+GO(gdk_keymap_have_bidi_layouts, iFp)
+GO(gdk_keymap_lookup_key, uFpp)
+GO(gdk_keymap_map_virtual_modifiers, iFpp)
+GO(gdk_keymap_translate_keyboard_state, iFpuiipppp)
+GO(gdk_keyval_convert_case, vFupp)
+GO(gdk_keyval_from_name, uFp)
+GO(gdk_keyval_is_lower, iFu)
+GO(gdk_keyval_is_upper, iFu)
+GO(gdk_keyval_name, pFu)
+GO(gdk_keyval_to_lower, uFu)
+GO(gdk_keyval_to_unicode, uFu)
+GO(gdk_keyval_to_upper, uFu)
+GO(gdk_line_style_get_type, iFv)
+GO(gdk_list_visuals, pFv)
+//GO(gdk_mbstowcs, 
+GO(gdk_modifier_type_get_type, iFv)
+GO(gdk_net_wm_supports, iFp)
+GO(gdk_notify_startup_complete, vFv)
+GO(gdk_notify_startup_complete_with_id, vFp)
+GO(gdk_notify_type_get_type, iFv)
+GO(gdk_offscreen_window_get_embedder, pFp)
+GO(gdk_offscreen_window_get_pixmap, pFp)
+GO(gdk_offscreen_window_get_type, iFv)
+GO(gdk_offscreen_window_set_embedder, vFpp)
+GO(gdk_overlap_type_get_type, iFv)
+GO(gdk_owner_change_get_type, iFv)
+GO(gdk_pango_attr_emboss_color_new, pFp)
+GO(gdk_pango_attr_embossed_new, pFi)
+GO(gdk_pango_attr_stipple_new, pFp)
+GO(gdk_pango_context_get, pFv)
+GO(gdk_pango_context_get_for_screen, pFp)
+GO(gdk_pango_context_set_colormap, vFpp)
+GO(gdk_pango_layout_get_clip_region, pFpiipi)
+GO(gdk_pango_layout_line_get_clip_region, pFpiipi)
+GO(gdk_pango_renderer_get_default, pFp)
+GO(gdk_pango_renderer_get_type, iFv)
+GO(gdk_pango_renderer_new, pFp)
+GO(gdk_pango_renderer_set_drawable, vFpp)
+GO(gdk_pango_renderer_set_gc, vFpp)
+GO(gdk_pango_renderer_set_override_color, vFpip)
+GO(gdk_pango_renderer_set_stipple, vFpip)
+GO(gdk_parse_args, vFpp)
+GO(gdk_pixbuf_get_from_drawable, pFpppiiiiii)
+GO(gdk_pixbuf_get_from_image, pFpppiiiiii)
+GO(gdk_pixbuf_render_pixmap_and_mask, vFpppi)
+GO(gdk_pixbuf_render_pixmap_and_mask_for_colormap, vFppppi)
+GO(gdk_pixbuf_render_threshold_alpha, vFppiiiiiii)
+GO(gdk_pixbuf_render_to_drawable, vFpppiiiiiiiii)
+GO(gdk_pixbuf_render_to_drawable_alpha, vFppiiiiiiiiiii)
+GO(gdk_pixmap_colormap_create_from_xpm, pFppppp)
+GO(gdk_pixmap_colormap_create_from_xpm_d, pFppppp)
+GO(gdk_pixmap_create_from_data, pFppiiipp)
+GO(gdk_pixmap_create_from_xpm, pFpppp)
+GO(gdk_pixmap_create_from_xpm_d, pFpppp)
+GO(gdk_pixmap_foreign_new, pFp)
+GO(gdk_pixmap_foreign_new_for_display, pFpp)
+GO(gdk_pixmap_foreign_new_for_screen, pFppiii)
+GO(gdk_pixmap_get_size, vFppp)
+GO(gdk_pixmap_get_type, iFv)
+GO(gdk_pixmap_impl_x11_get_type, iFv)
+GO(gdk_pixmap_lookup, pFp)
+GO(gdk_pixmap_lookup_for_display, pFpp)
+GO(gdk_pixmap_new, pFpiii)
+GO(gdk_pointer_grab, iFpiippu)
+//GO(gdk_pointer_grab_info_libgtk_only, 
+GO(gdk_pointer_is_grabbed, iFv)
+GO(gdk_pointer_ungrab, vFu)
+//GO(gdk_pre_parse_libgtk_only, 
+GO(gdk_property_change, vFpppiipi)
+GO(gdk_property_delete, vFpp)
+GO(gdk_property_get, iFpppLLipppp)
+GO(gdk_property_state_get_type, iFv)
+GO(gdk_prop_mode_get_type, iFv)
+GO(gdk_query_depths, vFpp)
+GO(gdk_query_visual_types, vFpp)
+GO(gdk_rectangle_get_type, iFv)
+GO(gdk_rectangle_intersect, iFppp)
+GO(gdk_rectangle_union, vFppp)
+GO(gdk_region_copy, pFp)
+GO(gdk_region_destroy, vFpp)
+GO(gdk_region_empty, iFp)
+GO(gdk_region_equal, iFpp)
+GO(gdk_region_get_clipbox, vFpp)
+GO(gdk_region_get_rectangles, vFppp)
+GO(gdk_region_intersect, vFpp)
+GO(gdk_region_new, pFv)
+GO(gdk_region_offset, vFpii)
+GO(gdk_region_point_in, iFpii)
+GO(gdk_region_polygon, pFpii)
+GO(gdk_region_rectangle, pFp)
+GO(gdk_region_rect_equal, iFpp)
+GO(gdk_region_rect_in, iFpp)
+GO(gdk_region_shrink, vFpii)
+//GOM(gdk_region_spans_intersect_foreach, vFppiiBp)
+GO(gdk_region_subtract, vFpp)
+GO(gdk_region_union, vFpp)
+GO(gdk_region_union_with_rect, vFpp)
+GO(gdk_region_xor, vFpp)
+GO(gdk_rgb_cmap_free, vFp)
+GO(gdk_rgb_cmap_new, pFpi)
+GO(gdk_rgb_colormap_ditherable, iFp)
+GO(gdk_rgb_ditherable, iFv)
+GO(gdk_rgb_dither_get_type, iFv)
+GO(gdk_rgb_find_color, vFpp)
+GO(gdk_rgb_gc_set_background, vFpu)
+GO(gdk_rgb_gc_set_foreground, vFpu)
+GO(gdk_rgb_get_colormap, pFv)
+GO(gdk_rgb_get_visual, pFv)
+GO(gdk_rgb_init, vFv)
+GO(gdk_rgb_set_install, vFi)
+GO(gdk_rgb_set_min_colors, vFi)
+GO(gdk_rgb_set_verbose, vFi)
+GO(gdk_rgb_xpixel_from_rgb, LFu)
+GO(gdk_screen_broadcast_client_message, vFpp)
+GO(gdk_screen_get_active_window, pFp)
+GO(gdk_screen_get_default, pFv)
+GO(gdk_screen_get_default_colormap, pFp)
+GO(gdk_screen_get_display, pFp)
+GO(gdk_screen_get_font_options, pFp)
+GO(gdk_screen_get_height, iFp)
+GO(gdk_screen_get_height_mm, iFp)
+GO(gdk_screen_get_monitor_at_point, iFpii)
+GO(gdk_screen_get_monitor_at_window, iFpp)
+GO(gdk_screen_get_monitor_geometry, vFpip)
+GO(gdk_screen_get_monitor_height_mm, iFpi)
+GO(gdk_screen_get_monitor_plug_name, pFpi)
+GO(gdk_screen_get_monitor_width_mm, iFpi)
+GO(gdk_screen_get_n_monitors, iFp)
+GO(gdk_screen_get_number, iFp)
+GO(gdk_screen_get_primary_monitor, iFp)
+GO(gdk_screen_get_resolution, dFp)
+GO(gdk_screen_get_rgba_colormap, pFp)
+GO(gdk_screen_get_rgba_visual, pFp)
+GO(gdk_screen_get_rgb_colormap, pFp)
+GO(gdk_screen_get_rgb_visual, pFp)
+GO(gdk_screen_get_root_window, pFp)
+GO(gdk_screen_get_setting, iFppp)
+GO(gdk_screen_get_system_colormap, pFp)
+GO(gdk_screen_get_system_visual, pFp)
+GO(gdk_screen_get_toplevel_windows, pFp)
+GO(gdk_screen_get_type, iFv)
+GO(gdk_screen_get_width, iFp)
+GO(gdk_screen_get_width_mm, iFp)
+GO(gdk_screen_get_window_stack, pFp)
+GO(gdk_screen_height, iFv)
+GO(gdk_screen_height_mm, iFv)
+GO(gdk_screen_is_composited, iFp)
+GO(gdk_screen_list_visuals, pFp)
+GO(gdk_screen_make_display_name, pFp)
+GO(gdk_screen_set_default_colormap, vFpp)
+GO(gdk_screen_set_font_options, vFpp)
+GO(gdk_screen_set_resolution, vFpd)
+GO(gdk_screen_width, iFv)
+GO(gdk_screen_width_mm, iFv)
+GO(gdk_scroll_direction_get_type, iFv)
+GO(gdk_selection_convert, vFpppu)
+GO(gdk_selection_owner_get, pFp)
+GO(gdk_selection_owner_get_for_display, pFpp)
+GO(gdk_selection_owner_set, iFppui)
+GO(gdk_selection_owner_set_for_display, iFpppui)
+GO(gdk_selection_property_get, iFpppp)
+GO(gdk_selection_send_notify, vFppppu)
+GO(gdk_selection_send_notify_for_display, vFpppppu)
+GO(gdk_set_allowed_backends, vFp)
+GO(gdk_set_double_click_time, vFu)
+GO(gdk_set_locale, pFv)
+//GOM(gdk_set_pointer_hooks, BFEB)
+GO(gdk_set_program_class, vFp)
+GO(gdk_set_show_events, vFi)
+GO(gdk_set_sm_client_id, vFp)
+GO(gdk_setting_action_get_type, iFv)
+GO(gdk_setting_get, iFpp)
+GO(gdk_set_use_xshm, vFi)
+GO(gdk_spawn_command_line_on_screen, iFppp)
+//GOM(gdk_spawn_on_screen, iFEppppipppp)
+//GOM(gdk_spawn_on_screen_with_pipes, iFEppppippppppp)
+GO(gdk_status_get_type, iFv)
+//GO(gdk_string_extents, 
+//GO(gdk_string_height, 
+//GO(gdk_string_measure, 
+GO(gdk_string_to_compound_text, iFppppp)
+GO(gdk_string_to_compound_text_for_display, iFpppppp)
+//GO(gdk_string_width, 
+//GO(gdk_subwindow_mode_get_type, 
+//GO(gdk_synthesize_window_state, 
+//GO(gdk_test_render_sync, 
+//GO(gdk_test_simulate_button, 
+//GO(gdk_test_simulate_key, 
+//GO(gdk_text_extents, 
+//GO(gdk_text_extents_wc, 
+//GO(gdk_text_height, 
+//GO(gdk_text_measure, 
+GO(gdk_text_property_to_text_list, iFpipip)
+GO(gdk_text_property_to_text_list_for_display, iFppipip)
+GO(gdk_text_property_to_utf8_list, iFpipip)
+//GO(gdk_text_property_to_utf8_list_for_display, 
+//GO(gdk_text_width, 
+//GO(gdk_text_width_wc, 
+//GOM(gdk_threads_add_idle, uFEpp)
+//GOM(gdk_threads_add_idle_full, uFEippp)
+//GOM(gdk_threads_add_timeout, uFEupp)
+//GOM(gdk_threads_add_timeout_full, uFEiuppp)
+//GOM(gdk_threads_add_timeout_seconds, uFEupp)
+//GOM(gdk_threads_add_timeout_seconds_full, uFEiuppp)
+GO(gdk_threads_enter, vFv)
+GO(gdk_threads_init, vFv)
+GO(gdk_threads_leave, vFv)
+//GOM(gdk_threads_set_lock_functions, vFEpp)
+GO(gdk_unicode_to_keyval, uFu)
+GO(gdk_utf8_to_compound_text, iFppppp)
+GO(gdk_utf8_to_compound_text_for_display, iFpppppp)
+GO(gdk_utf8_to_string_target, pFp)
+GO(gdk_visibility_state_get_type, iFv)
+GO(gdk_visual_get_best, pFv)
+GO(gdk_visual_get_best_depth, iFv)
+GO(gdk_visual_get_best_type, iFv)
+GO(gdk_visual_get_best_with_both, pFii)
+GO(gdk_visual_get_best_with_depth, pFi)
+GO(gdk_visual_get_best_with_type, pFi)
+GO(gdk_visual_get_bits_per_rgb, iFp)
+GO(gdk_visual_get_blue_pixel_details, vFpppp)
+GO(gdk_visual_get_byte_order, iFp)
+GO(gdk_visual_get_colormap_size, iFp)
+GO(gdk_visual_get_depth, iFp)
+GO(gdk_visual_get_green_pixel_details, vFpppp)
+GO(gdk_visual_get_red_pixel_details, vFpppp)
+GO(gdk_visual_get_screen, pFp)
+GO(gdk_visual_get_system, pFv)
+GO(gdk_visual_get_type, iFv)
+GO(gdk_visual_get_visual_type, iFp)
+GO(gdk_visual_type_get_type, iFv)
+GO(gdk_wayland_window_set_transient_for_exported, iFpp)
+//GO(gdk_wcstombs, 
+GOM(gdk_window_add_filter, vFEppp)
+GO(gdk_window_at_pointer, pFpp)
+//GO(gdk_window_attributes_type_get_type, 
+GO(gdk_window_beep, vFp)
+GO(gdk_window_begin_move_drag, vFpiiiu)
+GO(gdk_window_begin_paint_rect, vFpp)
+GO(gdk_window_begin_paint_region, vFpp)
+GO(gdk_window_begin_resize_drag, vFpuiiiu)
+GO(gdk_window_class_get_type, iFv)
+GO(gdk_window_clear, vFp)
+GO(gdk_window_clear_area, vFpiiii)
+GO(gdk_window_clear_area_e, vFpiiii)
+GO(gdk_window_configure_finished, vFp)
+GO(gdk_window_constrain_size, vFpuiipp)
+GO(gdk_window_coords_from_parent, vFpddpp)
+GO(gdk_window_coords_to_parent, vFpddpp)
+GO(gdk_window_create_similar_image_surface, pFpiiii)
+GO(gdk_window_create_similar_surface, pFpiii)
+GO(gdk_window_deiconify, vFp)
+GO(gdk_window_destroy, vFp)
+//GO(gdk_window_destroy_notify, 
+//GO(gdk_window_edge_get_type, 
+GO(gdk_window_enable_synchronized_configure, vFp)
+GO(gdk_window_end_paint, vFp)
+GO(gdk_window_ensure_native, iFp)
+GO(gdk_window_flush, vFp)
+GO(gdk_window_focus, vFpu)
+GO(gdk_window_foreign_new, pFp)
+GO(gdk_window_foreign_new_for_display, pFpp)
+//GO(gdk_window_freeze_toplevel_updates_libgtk_only, 
+GO(gdk_window_freeze_updates, vFp)
+GO(gdk_window_fullscreen, vFp)
+GO(gdk_window_geometry_changed, vFp)
+GO(gdk_window_get_accept_focus, iFp)
+GO(gdk_window_get_background_pattern, pFp)
+GO(gdk_window_get_children, pFp)
+GO(gdk_window_get_composited, iFp)
+GO(gdk_window_get_cursor, pFp)
+GO(gdk_window_get_decorations, iFpp)
+GO(gdk_window_get_deskrelative_origin, iFppp)
+GO(gdk_window_get_display, pFp)
+GO(gdk_window_get_effective_parent, pFp)
+GO(gdk_window_get_effective_toplevel, pFp)
+GO(gdk_window_get_events, vFpi)
+GO(gdk_window_get_focus_on_map, iFp)
+GO(gdk_window_get_frame_extents, vFpp)
+GO(gdk_window_get_geometry, vFpppppp)
+GO(gdk_window_get_group, pFp)
+GO(gdk_window_get_height, iFp)
+GO(gdk_window_get_internal_paint_info, vFpppp)
+GO(gdk_window_get_modal_hint, iFp)
+GO(gdk_window_get_origin, iFppp)
+GO(gdk_window_get_parent, pFp)
+GO(gdk_window_get_pointer, pFpppp)
+GO(gdk_window_get_position, vFppp)
+GO(gdk_window_get_root_coords, vFpiipp)
+GO(gdk_window_get_root_origin, vFppp)
+GO(gdk_window_get_screen, pFp)
+GO(gdk_window_get_state, iFp)
+GO(gdk_window_get_toplevel, pFp)
+GO(gdk_window_get_toplevels, pFp)
+GO(gdk_window_get_type_hint, iFp)
+GO(gdk_window_get_update_area, pFp)
+GO(gdk_window_get_user_data, vFpp)
+GO(gdk_window_get_visual, pFp)
+GO(gdk_window_get_width, iFp)
+GO(gdk_window_get_window_type, iFp)
+GO(gdk_window_has_native, iFp)
+GO(gdk_window_hide, vFp)
+GO(gdk_window_hints_get_type, iFv)
+GO(gdk_window_iconify, vFp)
+GO(gdk_window_impl_get_type, iFv)
+GO(gdk_window_impl_x11_get_type, iFv)
+GO(gdk_window_input_shape_combine_mask, vFppii)
+GO(gdk_window_input_shape_combine_region, vFppii)
+//GOM(gdk_window_invalidate_maybe_recurse, vFEppBp)
+GO(gdk_window_invalidate_rect, vFppi)
+GO(gdk_window_invalidate_region, vFppi)
+GO(gdk_window_is_destroyed, iFp)
+GO(gdk_window_is_input_only, iFp)
+GO(gdk_window_is_shaped, iFp)
+GO(gdk_window_is_viewable, iFp)
+GO(gdk_window_is_visible, iFp)
+GO(gdk_window_lookup, pFp)
+GO(gdk_window_lookup_for_display, pFpp)
+GO(gdk_window_lower, vFp)
+GO(gdk_window_maximize, vFp)
+GO(gdk_window_merge_child_input_shapes, vFp)
+GO(gdk_window_merge_child_shapes, vFp)
+GO(gdk_window_move, vFpii)
+GO(gdk_window_move_region, vFppii)
+GO(gdk_window_move_resize, vFpiiii)
+GO(gdk_window_new, pFppi)
+GO(gdk_window_object_get_type, iFv)
+GO(gdk_window_peek_children, pFp)
+GO(gdk_window_process_all_updates, vFv)
+GO(gdk_window_process_updates, vFpi)
+GO(gdk_window_raise, vFp)
+GO(gdk_window_redirect_to_drawable, vFppiiiiii)
+GO(gdk_window_register_dnd, vFp)
+GOM(gdk_window_remove_filter, vFEppp)
+GO(gdk_window_remove_redirection, vFp)
+GO(gdk_window_reparent, vFppii)
+GO(gdk_window_resize, vFpii)
+GO(gdk_window_restack, vFppi)
+GO(gdk_window_scroll, vFpii)
+GO(gdk_window_set_accept_focus, vFpi)
+GO(gdk_window_set_background, vFpp)
+GO(gdk_window_set_back_pixmap, vFppi)
+GO(gdk_window_set_child_input_shapes, vFp)
+GO(gdk_window_set_child_shapes, vFp)
+GO(gdk_window_set_composited, vFpi)
+GO(gdk_window_set_cursor, vFpp)
+GO(gdk_window_set_debug_updates, vFi)
+GO(gdk_window_set_decorations, vFpp)
+GO(gdk_window_set_events, vFpp)
+GO(gdk_window_set_focus_on_map, vFpi)
+GO(gdk_window_set_functions, vFpu)
+GO(gdk_window_set_geometry_hints, vFppi)
+GO(gdk_window_set_group, vFpp)
+GO(gdk_window_set_hints, vFpiiiiiii)
+GO(gdk_window_set_icon, vFpppp)
+GO(gdk_window_set_icon_list, vFpp)
+GO(gdk_window_set_icon_name, vFpp)
+GO(gdk_window_set_keep_above, vFpi)
+GO(gdk_window_set_keep_below, vFpi)
+GO(gdk_window_set_modal_hint, iFp)
+GO(gdk_window_set_opacity, vFpi)
+GO(gdk_window_set_override_redirect, vFpi)
+GO(gdk_window_set_role, vFpp)
+GO(gdk_window_set_skip_pager_hint, vFpi)
+GO(gdk_window_set_skip_taskbar_hint, vFpi)
+GO(gdk_window_set_startup_id, vFpp)
+GO(gdk_window_set_static_gravities, iFpi)
+GO(gdk_window_set_title, vFpp)
+GO(gdk_window_set_transient_for, vFpp)
+GO(gdk_window_set_type_hint, vFpi)
+GO(gdk_window_set_urgency_hint, vFpi)
+GO(gdk_window_set_user_data, vFpp)
+GO(gdk_window_shape_combine_mask, vFppii)
+GO(gdk_window_shape_combine_region, vFppii)
+GO(gdk_window_show, vFp)
+GO(gdk_window_show_unraised, vFp)
+GO(gdk_window_state_get_type, iFv)
+GO(gdk_window_stick, vFp)
+//GO(gdk_window_thaw_toplevel_updates_libgtk_only, 
+GO(gdk_window_thaw_updates, vFp)
+GO(gdk_window_type_get_type, iFv)
+GO(gdk_window_type_hint_get_type, iFv)
+GO(gdk_window_unfullscreen, vFp)
+GO(gdk_window_unmaximize, vFp)
+GO(gdk_window_unstick, vFp)
+GO(gdk_window_withdraw, vFp)
+GO(gdk_wm_decoration_get_type, iFv)
+GO(gdk_wm_function_get_type, iFv)
+GO(gdk_x11_atom_to_xatom, pFp)
+GO(gdk_x11_atom_to_xatom_for_display, pFpp)
+GO(gdk_x11_colormap_foreign_new, pFpp)
+GO(gdk_x11_colormap_get_xcolormap, pFp)
+GO(gdk_x11_colormap_get_xdisplay, pFp)
+GO(gdk_x11_cursor_get_xcursor, pFp)
+GO(gdk_x11_cursor_get_xdisplay, pFp)
+GO(gdk_x11_display_broadcast_startup_message, vFppppppppppppp)  //vaarg after 2 p
+GO(gdk_x11_display_get_startup_notification_id, pFp)
+GO(gdk_x11_display_get_type, iFv)
+GO(gdk_x11_display_get_user_time, uFp)
+GO(gdk_x11_display_get_xdisplay, pFp)
+GO(gdk_x11_window_get_xid, pFp)
+GO(gdk_x11_display_grab, vFp)
+GO(gdk_x11_display_set_cursor_theme, vFppi)
+//GO(gdk_x11_display_string_to_compound_text, 
+//GO(gdk_x11_display_text_property_to_text_list, 
+GO(gdk_x11_display_ungrab, vFp)
+//GO(gdk_x11_display_utf8_to_compound_text, 
+GO(gdk_x11_drawable_get_xdisplay, pFp)
+GO(gdk_x11_drawable_get_xid, pFp)
+GO(gdk_x11_font_get_name, pFp)
+GO(gdk_x11_font_get_xdisplay, pFp)
+GO(gdk_x11_font_get_xfont, pFp)
+//GO(gdk_x11_free_compound_text, 
+//GO(gdk_x11_free_text_list, 
+GO(gdk_x11_gc_get_xdisplay, pFp)
+GO(gdk_x11_gc_get_xgc, pFp)
+GO(gdk_x11_get_default_root_xwindow, pFv)
+GO(gdk_x11_get_default_screen, iFv)
+GO(gdk_x11_get_default_xdisplay, pFv)
+GO(gdk_x11_get_server_time, uFp)
+GO(gdk_x11_get_xatom_by_name, pFp)
+GO(gdk_x11_get_xatom_by_name_for_display, pFpp)
+GO(gdk_x11_get_xatom_name, pFp)
+GO(gdk_x11_get_xatom_name_for_display, pFpp)
+GO(gdk_x11_grab_server, vFv)
+GO(gdk_x11_image_get_xdisplay, pFp)
+GO(gdk_x11_image_get_ximage, pFp)
+GO(gdk_x11_lookup_xdisplay, pFp)
+GO(gdk_x11_pixmap_get_drawable_impl, pFp)
+GO(gdk_x11_register_standard_event_type, vFpii)
+GO(gdk_x11_screen_get_monitor_output, pFpi)
+GO(gdk_x11_screen_get_screen_number, iFp)
+GO(gdk_x11_screen_get_window_manager_name, pFp)
+GO(gdk_x11_screen_get_xscreen, pFp)
+GO(gdk_x11_screen_lookup_visual, pFpp)
+GO(gdk_x11_screen_supports_net_wm_hint, iFpp)
+GO(gdk_x11_set_sm_client_id, vFp)
+GO(gdk_x11_ungrab_server, vFv)
+GO(gdk_x11_visual_get_xvisual, pFp)
+GO(gdk_x11_window_foreign_new_for_display, pFpp)
+GO(gdk_x11_window_get_drawable_impl, pFp)
+GO(gdk_x11_window_lookup_for_display, pFpp)
+GO(gdk_x11_window_move_to_current_desktop, vFp)
+GO(gdk_x11_window_set_user_time, vFpu)
+GO(gdk_x11_xatom_to_atom, pFp)
+GO(gdk_x11_xatom_to_atom_for_display, pFpp)
+GO(gdkx_colormap_get, pFu)
+GO(gdk_xid_table_lookup, pFp)
+GO(gdk_xid_table_lookup_for_display, pFpp)
+GO(gdkx_visual_get, pFp)
+
+DATA(gdk_display, 4)        // no hack here...
+DATA(gdk_threads_lock, 4)
+DATA(gdk_threads_unlock, 4)
+
+GO(dummy_set_child_property, vFppupp)       // to get vFppupp for gtkclass.c
+GO(dummy_constructor, vFLup)    // to get vFlup for gtkclass.c
\ No newline at end of file
diff --git a/src/wrapped/wrappedgtk3.c b/src/wrapped/wrappedgtk3.c
new file mode 100755
index 00000000..54ea72c9
--- /dev/null
+++ b/src/wrapped/wrappedgtk3.c
@@ -0,0 +1,647 @@
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dlfcn.h>
+
+#include "wrappedlibs.h"
+
+#include "debug.h"
+#include "wrapper.h"
+#include "bridge.h"
+#include "librarian/library_private.h"
+#include "x64emu.h"
+#include "emu/x64emu_private.h"
+#include "callback.h"
+#include "librarian.h"
+#include "box64context.h"
+#include "emu/x64emu_private.h"
+#include "myalign.h"
+#include "gtkclass.h"
+
+const char* gtk3Name = "libgtk-3.so.0";
+static char* libname = NULL;
+#define LIBNAME gtk3
+
+typedef size_t        (*LFv_t)(void);
+typedef void          (*vFp_t)(void*);
+typedef double        (*dFp_t)(void*);
+typedef void*         (*pFL_t)(size_t);
+typedef void*         (*pFpp_t)(void*, void*);
+typedef void*         (*pFpu_t)(void*, uint32_t);
+typedef void*         (*pFppi_t)(void*, void*, int);
+typedef void*         (*pFppp_t)(void*, void*, void*);
+typedef int           (*iFppp_t)(void*, void*, void*);
+typedef void          (*vFpipV_t)(void*, int, void*, ...);
+
+#define ADDED_FUNCTIONS()                   \
+GO(g_type_class_ref, pFL_t)                 \
+GO(g_type_class_unref, vFp_t)               \
+GO(g_initially_unowned_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_container_get_type, LFv_t)           \
+GO(gtk_misc_get_type, LFv_t)                \
+GO(gtk_label_get_type, LFv_t)               \
+GO(gtk_tree_view_get_type, LFv_t)           \
+GO(gtk_window_get_type, LFv_t)              \
+GO(gtk_table_get_type, LFv_t)               \
+GO(gtk_fixed_get_type, LFv_t)               \
+GO(gtk_combo_box_get_type, LFv_t)           \
+GO(gtk_toggle_button_get_type, LFv_t)       \
+GO(gtk_check_button_get_type, LFv_t)        \
+GO(gtk_frame_get_type, LFv_t)               \
+GO(gtk_entry_get_type, LFv_t)               \
+GO(gtk_spin_button_get_type, LFv_t)         \
+GO(gtk_progress_get_type, LFv_t)            \
+GO(gtk_progress_bar_get_type, LFv_t)        \
+GO(gtk_menu_shell_get_type, LFv_t)          \
+GO(gtk_menu_bar_get_type, LFv_t)            \
+GO(gtk_action_get_type, LFv_t)              \
+GO(gtk_dialog_add_button, pFppi_t)          \
+GO(gtk_spin_button_get_value, dFp_t)        \
+GO(gtk_builder_lookup_callback_symbol, pFpp_t)  \
+GO(g_module_symbol, iFppp_t)                \
+GO(g_log, vFpipV_t)                         \
+GO(g_module_open, pFpu_t)                   \
+GO(g_module_close, vFp_t)                   \
+
+#include "generated/wrappedgtk3types.h"
+
+
+#include "wrappercallback.h"
+
+EXPORT uintptr_t my3_gtk_signal_connect_full(x64emu_t* emu, void* object, void* name, void* c_handler, void* unsupported, void* data, void* closure, uint32_t signal, int after)
+{
+    my_signal_t *sig = new_mysignal(c_handler, data, closure);
+    uintptr_t ret = my->gtk_signal_connect_full(object, name, my_signal_cb, NULL, sig, my_signal_delete, signal, after);
+    printf_log(LOG_DEBUG, "Connecting gtk signal \"%s\" with cb=%p\n", (char*)name, sig);
+    return ret;
+}
+
+#define SUPER() \
+GO(0)   \
+GO(1)   \
+GO(2)   \
+GO(3)
+
+// GtkMenuDetachFunc
+#define GO(A)   \
+static uintptr_t my_menudetach_fct_##A = 0;   \
+static void my_menudetach_##A(void* widget, void* menu)     \
+{                                       \
+    RunFunction(my_context, my_menudetach_fct_##A, 2, widget, menu);\
+}
+SUPER()
+#undef GO
+static void* findMenuDetachFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_menudetach_fct_##A == (uintptr_t)fct) return my_menudetach_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_menudetach_fct_##A == 0) {my_menudetach_fct_##A = (uintptr_t)fct; return my_menudetach_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gtk-3 GMenuDetachFunc callback\n");
+    return NULL;
+}
+
+// GtkMenuPositionFunc
+#define GO(A)   \
+static uintptr_t my_menuposition_fct_##A = 0;   \
+static void my_menuposition_##A(void* menu, void* x, void* y, void* push_in, void* data)     \
+{                                       \
+    RunFunction(my_context, my_menuposition_fct_##A, 5, menu, x, y, push_in, data);\
+}
+SUPER()
+#undef GO
+static void* findMenuPositionFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_menuposition_fct_##A == (uintptr_t)fct) return my_menuposition_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_menuposition_fct_##A == 0) {my_menuposition_fct_##A = (uintptr_t)fct; return my_menuposition_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gtk-3 GtkMenuPositionFunc callback\n");
+    return NULL;
+}
+
+// GtkFunction
+#define GO(A)   \
+static uintptr_t my3_gtkfunction_fct_##A = 0;   \
+static int my3_gtkfunction_##A(void* data)     \
+{                                       \
+    return RunFunction(my_context, my3_gtkfunction_fct_##A, 1, data);\
+}
+SUPER()
+#undef GO
+static void* findGtkFunctionFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my3_gtkfunction_fct_##A == (uintptr_t)fct) return my3_gtkfunction_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my3_gtkfunction_fct_##A == 0) {my3_gtkfunction_fct_##A = (uintptr_t)fct; return my3_gtkfunction_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gtk-3 GtkFunction callback\n");
+    return NULL;
+}
+
+// GtkClipboardGetFunc
+#define GO(A)   \
+static uintptr_t my_clipboardget_fct_##A = 0;   \
+static void my_clipboardget_##A(void* clipboard, void* selection, uint32_t info, void* data)     \
+{                                       \
+    RunFunction(my_context, my_clipboardget_fct_##A, 4, clipboard, selection, info, data);\
+}
+SUPER()
+#undef GO
+static void* findClipboadGetFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_clipboardget_fct_##A == (uintptr_t)fct) return my_clipboardget_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_clipboardget_fct_##A == 0) {my_clipboardget_fct_##A = (uintptr_t)fct; return my_clipboardget_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gtk-3 GtkClipboardGetFunc callback\n");
+    return NULL;
+}
+
+// GtkClipboardClearFunc
+#define GO(A)   \
+static uintptr_t my_clipboardclear_fct_##A = 0;   \
+static void my_clipboardclear_##A(void* clipboard, void* data)     \
+{                                       \
+    RunFunction(my_context, my_clipboardclear_fct_##A, 2, clipboard, data);\
+}
+SUPER()
+#undef GO
+static void* findClipboadClearFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_clipboardclear_fct_##A == (uintptr_t)fct) return my_clipboardclear_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_clipboardclear_fct_##A == 0) {my_clipboardclear_fct_##A = (uintptr_t)fct; return my_clipboardclear_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gtk-3 GtkClipboardClearFunc callback\n");
+    return NULL;
+}
+
+// GtkCallback
+#define GO(A)   \
+static uintptr_t my3_gtkcallback_fct_##A = 0;   \
+static void my3_gtkcallback_##A(void* widget, void* data)     \
+{                                       \
+    RunFunction(my_context, my3_gtkcallback_fct_##A, 2, widget, data);\
+}
+SUPER()
+#undef GO
+static void* findGtkCallbackFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my3_gtkcallback_fct_##A == (uintptr_t)fct) return my3_gtkcallback_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my3_gtkcallback_fct_##A == 0) {my3_gtkcallback_fct_##A = (uintptr_t)fct; return my3_gtkcallback_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gtk-3 GtkCallback callback\n");
+    return NULL;
+}
+
+// GtkTextCharPredicate
+#define GO(A)   \
+static uintptr_t my_textcharpredicate_fct_##A = 0;   \
+static int my_textcharpredicate_##A(uint32_t ch, void* data)     \
+{                                       \
+    return (int)RunFunction(my_context, my_textcharpredicate_fct_##A, 2, ch, data);\
+}
+SUPER()
+#undef GO
+static void* findGtkTextCharPredicateFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_textcharpredicate_fct_##A == (uintptr_t)fct) return my_textcharpredicate_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_textcharpredicate_fct_##A == 0) {my_textcharpredicate_fct_##A = (uintptr_t)fct; return my_textcharpredicate_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gtk-3 GtkTextCharPredicate callback\n");
+    return NULL;
+}
+
+// Toolbar
+#define GO(A)   \
+static uintptr_t my_toolbar_fct_##A = 0;   \
+static void my_toolbar_##A(void* widget, void* data)     \
+{                                       \
+    RunFunction(my_context, my_toolbar_fct_##A, 2, widget, data);\
+}
+SUPER()
+#undef GO
+static void* findToolbarFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_toolbar_fct_##A == (uintptr_t)fct) return my_toolbar_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_toolbar_fct_##A == 0) {my_toolbar_fct_##A = (uintptr_t)fct; return my_toolbar_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gtk-3 Toolbar callback\n");
+    return NULL;
+}
+
+// Builder
+#define GO(A)   \
+static uintptr_t my_builderconnect_fct_##A = 0;   \
+static void my_builderconnect_##A(void* builder, void* object, void* signal, void* handler, void* connect, int flags, void* data)     \
+{                                       \
+    RunFunction(my_context, my_builderconnect_fct_##A, 7, builder, object, signal, handler, connect, flags, data);\
+}
+SUPER()
+#undef GO
+static void* findBuilderConnectFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_builderconnect_fct_##A == (uintptr_t)fct) return my_builderconnect_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_builderconnect_fct_##A == 0) {my_builderconnect_fct_##A = (uintptr_t)fct; return my_builderconnect_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gtk-3 BuilderConnect callback\n");
+    return NULL;
+}
+
+// GtkTreeViewSearchEqualFunc
+#define GO(A)   \
+static uintptr_t my_GtkTreeViewSearchEqualFunc_fct_##A = 0;                                                     \
+static int my_GtkTreeViewSearchEqualFunc_##A(void* model, int column, void* key, void* iter, void* data)        \
+{                                                                                                               \
+    return RunFunction(my_context, my_GtkTreeViewSearchEqualFunc_fct_##A, 5, model, column, key, iter, data);   \
+}
+SUPER()
+#undef GO
+static void* findGtkTreeViewSearchEqualFuncFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_GtkTreeViewSearchEqualFunc_fct_##A == (uintptr_t)fct) return my_GtkTreeViewSearchEqualFunc_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_GtkTreeViewSearchEqualFunc_fct_##A == 0) {my_GtkTreeViewSearchEqualFunc_fct_##A = (uintptr_t)fct; return my_GtkTreeViewSearchEqualFunc_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gtk-3 GtkTreeViewSearchEqualFunc callback\n");
+    return NULL;
+}
+// GtkTreeCellDataFunc
+#define GO(A)   \
+static uintptr_t my_GtkTreeCellDataFunc_fct_##A = 0;                                                \
+static void my_GtkTreeCellDataFunc_##A(void* tree, void* cell, void* model, void* iter, void* data) \
+{                                                                                                   \
+    RunFunction(my_context, my_GtkTreeCellDataFunc_fct_##A, 5, tree, cell, model, iter, data);      \
+}
+SUPER()
+#undef GO
+static void* findGtkTreeCellDataFuncFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_GtkTreeCellDataFunc_fct_##A == (uintptr_t)fct) return my_GtkTreeCellDataFunc_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_GtkTreeCellDataFunc_fct_##A == 0) {my_GtkTreeCellDataFunc_fct_##A = (uintptr_t)fct; return my_GtkTreeCellDataFunc_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gtk-3 GtkTreeCellDataFunc callback\n");
+    return NULL;
+}
+
+// GDestroyNotify
+#define GO(A)   \
+static uintptr_t my_GDestroyNotify_fct_##A = 0;                     \
+static void my_GDestroyNotify_##A(void* data)                       \
+{                                                                   \
+    RunFunction(my_context, my_GDestroyNotify_fct_##A, 1, data);    \
+}
+SUPER()
+#undef GO
+static void* findGDestroyNotifyFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_GDestroyNotify_fct_##A == (uintptr_t)fct) return my_GDestroyNotify_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_GDestroyNotify_fct_##A == 0) {my_GDestroyNotify_fct_##A = (uintptr_t)fct; return my_GDestroyNotify_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gtk-3 GDestroyNotify callback\n");
+    return NULL;
+}
+
+// GtkTreeIterCompareFunc
+#define GO(A)   \
+static uintptr_t my_GtkTreeIterCompareFunc_fct_##A = 0;                                         \
+static int my_GtkTreeIterCompareFunc_##A(void* model, void* a, void* b, void* data)             \
+{                                                                                               \
+    return RunFunction(my_context, my_GtkTreeIterCompareFunc_fct_##A, 4, model, a, b, data);    \
+}
+SUPER()
+#undef GO
+static void* findGtkTreeIterCompareFuncFct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_GtkTreeIterCompareFunc_fct_##A == (uintptr_t)fct) return my_GtkTreeIterCompareFunc_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_GtkTreeIterCompareFunc_fct_##A == 0) {my_GtkTreeIterCompareFunc_fct_##A = (uintptr_t)fct; return my_GtkTreeIterCompareFunc_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for gtk-3 GtkTreeIterCompareFunc callback\n");
+    return NULL;
+}
+
+#undef SUPER
+/*
+EXPORT void my3_gtk_dialog_add_buttons(x64emu_t* emu, void* dialog, void* first, uintptr_t* b)
+{
+    void* btn = first;
+    while(btn) {
+        int id = (int)*(b++);
+        my->gtk_dialog_add_button(dialog, btn, id);
+        btn = (void*)*(b++);
+    }
+}
+*/
+EXPORT void my3_gtk_message_dialog_format_secondary_text(x64emu_t* emu, void* dialog, void* fmt, void* b)
+{
+    char* buf = NULL;
+    myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 2);
+    PREPARE_VALIST;
+    int ret = vasprintf(&buf, fmt, VARARGS);
+    (void)ret;
+    // pre-bake the fmt/vaarg, because there is no "va_list" version of this function
+    my->gtk_message_dialog_format_secondary_text(dialog, buf);
+    free(buf);
+}
+/*
+EXPORT void my3_gtk_message_dialog_format_secondary_markup(x64emu_t* emu, void* dialog, void* fmt, void* b)
+{
+    char* buf = NULL;
+    #ifndef NOALIGN
+    myStackAlign((const char*)fmt, b, emu->scratch);
+    PREPARE_VALIST;
+    iFppp_t f = (iFppp_t)vasprintf;
+    f(&buf, fmt, VARARGS);
+    #else
+    iFppp_t f = (iFppp_t)vasprintf;
+    f(&buf, fmt, b);
+    #endif
+    // pre-bake the fmt/vaarg, because there is no "va_list" version of this function
+    my->gtk_message_dialog_format_secondary_markup(dialog, buf);
+    free(buf);
+}
+*/
+EXPORT void* my3_gtk_type_class(x64emu_t* emu, size_t type)
+{
+    void* class = my->gtk_type_class(type);
+    return wrapCopyGTKClass(class, type);
+}
+
+EXPORT void my3_gtk_init(x64emu_t* emu, void* argc, void* argv)
+{
+    my->gtk_init(argc, argv);
+    my_checkGlobalGdkDisplay();
+    AutoBridgeGtk(my->g_type_class_ref, my->g_type_class_unref);
+}
+
+EXPORT int my3_gtk_init_check(x64emu_t* emu, void* argc, void* argv)
+{
+    int ret = my->gtk_init_check(argc, argv);
+    my_checkGlobalGdkDisplay();
+    AutoBridgeGtk(my->g_type_class_ref, my->g_type_class_unref);
+    return ret;
+}
+
+EXPORT int my3_gtk_init_with_args(x64emu_t* emu, void* argc, void* argv, void* param, void* entries, void* trans, void* error)
+{
+    int ret = my->gtk_init_with_args(argc, argv, param, entries, trans, error);
+    my_checkGlobalGdkDisplay();
+    AutoBridgeGtk(my->g_type_class_ref, my->g_type_class_unref);
+    return ret;
+}
+
+EXPORT void my3_gtk_menu_attach_to_widget(x64emu_t* emu, void* menu, void* widget, void* f)
+{
+    my->gtk_menu_attach_to_widget(menu, widget, findMenuDetachFct(f));
+}
+
+EXPORT void my3_gtk_menu_popup(x64emu_t* emu, void* menu, void* shell, void* item, void* f, void* data, uint32_t button, uint32_t time_)
+{
+    my->gtk_menu_popup(menu, shell, item, findMenuPositionFct(f), data, button, time_);
+}
+
+EXPORT uint32_t my3_gtk_timeout_add(x64emu_t* emu, uint32_t interval, void* f, void* data)
+{
+    return my->gtk_timeout_add(interval, findGtkFunctionFct(f), data);
+}
+
+EXPORT int my3_gtk_clipboard_set_with_data(x64emu_t* emu, void* clipboard, void* target, uint32_t n, void* f_get, void* f_clear, void* data)
+{
+    return my->gtk_clipboard_set_with_data(clipboard, target, n, findClipboadGetFct(f_get), findClipboadClearFct(f_clear), data);
+}
+
+EXPORT int my3_gtk_clipboard_set_with_owner(x64emu_t* emu, void* clipboard, void* target, uint32_t n, void* f_get, void* f_clear, void* data)
+{
+    return my->gtk_clipboard_set_with_owner(clipboard, target, n, findClipboadGetFct(f_get), findClipboadClearFct(f_clear), data);
+}
+
+static void* my_translate_func(void* path, my_signal_t* sig)
+{
+    return (void*)RunFunction(my_context, sig->c_handler, 2, path, sig->data);
+}
+
+EXPORT void my3_gtk_stock_set_translate_func(x64emu_t* emu, void* domain, void* f, void* data, void* notify)
+{
+    my_signal_t *sig = new_mysignal(f, data, notify);
+    my->gtk_stock_set_translate_func(domain, my_translate_func, sig, my_signal_delete);
+}
+
+EXPORT void my3_gtk_container_forall(x64emu_t* emu, void* container, void* f, void* data)
+{
+    my->gtk_container_forall(container, findGtkCallbackFct(f), data);
+}
+
+EXPORT void my3_gtk_tree_view_set_search_equal_func(x64emu_t* emu, void* tree_view, void* f, void* data, void* notify)
+{
+    my->gtk_tree_view_set_search_equal_func(tree_view, findGtkTreeViewSearchEqualFuncFct(f), data, findGDestroyNotifyFct(notify));
+}
+
+EXPORT int my3_gtk_text_iter_backward_find_char(x64emu_t* emu, void* iter, void* f, void* data, void* limit)
+{
+    return my->gtk_text_iter_backward_find_char(iter, findGtkTextCharPredicateFct(f), data, limit);
+}
+
+EXPORT int my3_gtk_text_iter_forward_find_char(x64emu_t* emu, void* iter, void* f, void* data, void* limit)
+{
+    return my->gtk_text_iter_forward_find_char(iter, findGtkTextCharPredicateFct(f), data, limit);
+}
+
+EXPORT void* my3_gtk_toolbar_append_item(x64emu_t* emu, void* toolbar, void* text, void* tooltip_text, void* tooltip_private, void* icon, void* f, void* data)
+{
+    return my->gtk_toolbar_append_item(toolbar, text, tooltip_text, tooltip_private, icon, findToolbarFct(f), data);
+}
+
+EXPORT void* my3_gtk_toolbar_prepend_item(x64emu_t* emu, void* toolbar, void* text, void* tooltip_text, void* tooltip_private, void* icon, void* f, void* data)
+{
+    return my->gtk_toolbar_prepend_item(toolbar, text, tooltip_text, tooltip_private, icon, findToolbarFct(f), data);
+}
+
+EXPORT void* my3_gtk_toolbar_insert_item(x64emu_t* emu, void* toolbar, void* text, void* tooltip_text, void* tooltip_private, void* icon, void* f, void* data, int position)
+{
+    return my->gtk_toolbar_insert_item(toolbar, text, tooltip_text, tooltip_private, icon, findToolbarFct(f), data, position);
+}
+
+EXPORT void* my3_gtk_toolbar_append_element(x64emu_t* emu, void* toolbar, size_t type, void* widget, void* text, void* tooltip_text, void* tooltip_private, void* icon, void* f, void* data)
+{
+    return my->gtk_toolbar_append_element(toolbar, type, widget, text, tooltip_text, tooltip_private, icon, findToolbarFct(f), data);
+}
+
+EXPORT void* my3_gtk_toolbar_prepend_element(x64emu_t* emu, void* toolbar, size_t type, void* widget, void* text, void* tooltip_text, void* tooltip_private, void* icon, void* f, void* data)
+{
+    return my->gtk_toolbar_prepend_element(toolbar, type, widget, text, tooltip_text, tooltip_private, icon, findToolbarFct(f), data);
+}
+
+EXPORT void* my3_gtk_toolbar_insert_element(x64emu_t* emu, void* toolbar, size_t type, void* widget, void* text, void* tooltip_text, void* tooltip_private, void* icon, void* f, void* data, int position)
+{
+    return my->gtk_toolbar_insert_element(toolbar, type, widget, text, tooltip_text, tooltip_private, icon, findToolbarFct(f), data, position);
+}
+
+EXPORT void* my3_gtk_toolbar_insert_stock(x64emu_t* emu, void* toolbar, void* stock_id, void* tooltip_text, void* tooltip_private, void* f, void* data, int position)
+{
+    return my->gtk_toolbar_insert_stock(toolbar, stock_id, tooltip_text, tooltip_private, findToolbarFct(f), data, position);
+}
+
+EXPORT void my3_gtk_tree_sortable_set_sort_func(x64emu_t* emu, void* sortable, int id, void* f, void* data, void* notify)
+{
+    my->gtk_tree_sortable_set_sort_func(sortable, id, findGtkTreeIterCompareFuncFct(f), data, findGDestroyNotifyFct(notify));
+}
+
+EXPORT void my3_gtk_tree_sortable_set_default_sort_func(x64emu_t* emu, void* sortable, void* f, void* data, void* notify)
+{
+    my->gtk_tree_sortable_set_default_sort_func(sortable, findGtkTreeIterCompareFuncFct(f), data, findGDestroyNotifyFct(notify));
+}
+
+EXPORT int my3_gtk_type_unique(x64emu_t* emu, size_t parent, my_GtkTypeInfo_t* gtkinfo)
+{
+    return my->gtk_type_unique(parent, findFreeGtkTypeInfo(gtkinfo, parent));
+}
+
+EXPORT unsigned long my3_gtk_signal_connect(x64emu_t* emu, void* object, void* name, void* func, void* data)
+{
+    return my3_gtk_signal_connect_full(emu, object, name, func, NULL, data, NULL, 0, 0);
+}
+
+EXPORT void my3_gtk_object_set_data_full(x64emu_t* emu, void* object, void* key, void* data, void* notify)
+{
+    my->gtk_object_set_data_full(object, key, data, findGDestroyNotifyFct(notify));
+}
+
+EXPORT float my3_gtk_spin_button_get_value_as_float(x64emu_t* emu, void* spinner)
+{
+    return my->gtk_spin_button_get_value(spinner);
+}
+
+EXPORT void my3_gtk_builder_connect_signals_full(x64emu_t* emu, void* builder, void* f, void* data)
+{
+    my->gtk_builder_connect_signals_full(builder, findBuilderConnectFct(f), data);
+}
+
+typedef struct my_connectargs_s {
+  void* module;
+  void* data;
+} my_connectargs_t;
+//defined in gobject2...
+uintptr_t my_g_signal_connect_object(x64emu_t* emu, void* instance, void* detailed, void* c_handler, void* object, uint32_t flags);
+uintptr_t my_g_signal_connect_data(x64emu_t* emu, void* instance, void* detailed, void* c_handler, void* data, void* closure, uint32_t flags);
+static void my3_gtk_builder_connect_signals_default(void* builder, void* object, 
+                                                    char* signal_name, char* handler_name,
+                                                    void* connect_object, uint32_t flags, my_connectargs_t* args)
+{
+  void* func = my->gtk_builder_lookup_callback_symbol(builder, handler_name);
+  if (!func && args && args->module) {
+    my->g_module_symbol(args->module, handler_name, &func);
+  }
+  // Mixing Native and emulated code... the my_g_signal_* function will handle that (GetNativeFnc does)
+  if(!func)
+      func = (void*)FindGlobalSymbol(my_context->maplib, handler_name, 0, NULL);
+
+  if(!func) {
+      my->g_log("Gtk", 1<<4, "Could not find signal handler '%s'.", handler_name);
+      return;
+  }
+
+  if (connect_object)
+    my_g_signal_connect_object(thread_get_emu(), object, signal_name, func, connect_object, flags);
+  else
+    my_g_signal_connect_data(thread_get_emu(), object, signal_name, func, args->data, NULL, flags);
+}
+
+EXPORT void my3_gtk_builder_connect_signals(x64emu_t* emu, void* builder, void* data)
+{
+    my_connectargs_t args = {0};
+    args.data = data;
+    if(my->g_module_open && my->g_module_close)
+        args.module = my->g_module_open(NULL, 1);
+
+    my->gtk_builder_connect_signals_full(builder, my3_gtk_builder_connect_signals_default, &args);
+
+    if(args.module)
+        my->g_module_close(args.module);
+}
+
+EXPORT void my3_gtk_tree_view_column_set_cell_data_func(x64emu_t* emu, void* tree, void* cell, void* f, void* data, void* destroy)
+{
+    my->gtk_tree_view_column_set_cell_data_func(tree, cell, findGtkTreeCellDataFuncFct(f), data, findGDestroyNotifyFct(destroy));
+}
+
+#define PRE_INIT    \
+    if(box64_nogtk) \
+        return -1;
+
+#define CUSTOM_INIT \
+    libname = lib->name;                                        \
+    getMy(lib);                                                 \
+    SETALT(my3_);                                               \
+    SetGInitiallyUnownedID(my->g_initially_unowned_get_type()); \
+    SetGtkWidget3ID(my->gtk_widget_get_type());                 \
+    SetGtkActionID(my->gtk_action_get_type());                  \
+    setNeededLibs(lib, 2, "libgdk-3.so.0", "libpangocairo-1.0.so.0");
+
+#define CUSTOM_FINI \
+    freeMy();
+
+#include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedgtk3_private.h b/src/wrapped/wrappedgtk3_private.h
new file mode 100755
index 00000000..7e8ed8a0
--- /dev/null
+++ b/src/wrapped/wrappedgtk3_private.h
@@ -0,0 +1,4120 @@
+#if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
+#error meh!
+#endif
+
+//GO(gtk_about_dialog_get_artists, 
+//GO(gtk_about_dialog_get_authors, 
+//GO(gtk_about_dialog_get_comments, 
+//GO(gtk_about_dialog_get_copyright, 
+//GO(gtk_about_dialog_get_documenters, 
+//GO(gtk_about_dialog_get_license, 
+//GO(gtk_about_dialog_get_logo, 
+//GO(gtk_about_dialog_get_logo_icon_name, 
+//GO(gtk_about_dialog_get_name, 
+//GO(gtk_about_dialog_get_program_name, 
+//GO(gtk_about_dialog_get_translator_credits, 
+GO(gtk_about_dialog_get_type, iFv)
+//GO(gtk_about_dialog_get_version, 
+//GO(gtk_about_dialog_get_website, 
+//GO(gtk_about_dialog_get_website_label, 
+//GO(gtk_about_dialog_get_wrap_license, 
+//GO(gtk_about_dialog_new, 
+//GO(gtk_about_dialog_set_artists, 
+//GO(gtk_about_dialog_set_authors, 
+//GO(gtk_about_dialog_set_comments, 
+//GO(gtk_about_dialog_set_copyright, 
+//GO(gtk_about_dialog_set_documenters, 
+//GO(gtk_about_dialog_set_email_hook, 
+//GO(gtk_about_dialog_set_license, 
+//GO(gtk_about_dialog_set_logo, 
+//GO(gtk_about_dialog_set_logo_icon_name, 
+//GO(gtk_about_dialog_set_name, 
+//GO(gtk_about_dialog_set_program_name, 
+//GO(gtk_about_dialog_set_translator_credits, 
+//GO(gtk_about_dialog_set_url_hook, 
+//GO(gtk_about_dialog_set_version, 
+//GO(gtk_about_dialog_set_website, 
+//GO(gtk_about_dialog_set_website_label, 
+//GO(gtk_about_dialog_set_wrap_license, 
+GO(gtk_accelerator_get_default_mod_mask, uFv)
+GO(gtk_accelerator_get_label, pFui)
+GO(gtk_accelerator_name, pFui)
+GO(gtk_accelerator_parse, vFppp)
+GO(gtk_accelerator_set_default_mod_mask, vFu)
+GO(gtk_accelerator_valid, iFui)
+GO(gtk_accel_flags_get_type, iFv)
+GO(gtk_accel_group_activate, iFpppui)
+GO(gtk_accel_group_connect, vFpuiip)  // Closure probably needs wrapping when not null
+GO(gtk_accel_group_connect_by_path, vFppp)
+GO(gtk_accel_group_disconnect, iFpp)
+GO(gtk_accel_group_disconnect_key, iFpui)
+//GOM(gtk_accel_group_find, pFEppp)
+GO(gtk_accel_group_from_accel_closure, pFp)
+GO(gtk_accel_group_get_is_locked, iFp)
+GO(gtk_accel_group_get_modifier_mask, iFp)
+GO(gtk_accel_group_get_type, iFv)
+GO(gtk_accel_group_lock, vFp)
+GO(gtk_accel_group_new, pFv)
+GO(gtk_accel_group_query, pFpuip)
+GO(gtk_accel_groups_activate, iFpui)
+GO(gtk_accel_groups_from_object, pFp)
+GO(gtk_accel_group_unlock, vFp)
+//GO(gtk_accel_label_get_accel_widget, 
+//GO(gtk_accel_label_get_accel_width, 
+GO(gtk_accel_label_get_type, iFv)
+//GO(gtk_accel_label_new, 
+//GO(gtk_accel_label_refetch, 
+//GO(gtk_accel_label_set_accel_closure, 
+//GO(gtk_accel_label_set_accel_widget, 
+//GO(gtk_accel_map_add_entry, 
+//GO(gtk_accel_map_add_filter, 
+//GO(gtk_accel_map_change_entry, 
+//GO(gtk_accel_map_foreach, 
+//GO(gtk_accel_map_foreach_unfiltered, 
+//GO(gtk_accel_map_get, 
+GO(gtk_accel_map_get_type, iFv)
+//GO(gtk_accel_map_load, 
+//GO(gtk_accel_map_load_fd, 
+//GO(gtk_accel_map_load_scanner, 
+//GO(gtk_accel_map_lock_path, 
+//GO(gtk_accel_map_lookup_entry, 
+//GO(gtk_accel_map_save, 
+//GO(gtk_accel_map_save_fd, 
+//GO(gtk_accel_map_unlock_path, 
+//GO(gtk_accessible_connect_widget_destroyed, 
+GO(gtk_accessible_get_type, iFv)
+//GO(gtk_accessible_get_widget, 
+//GO(gtk_accessible_set_widget, 
+//GO(gtk_action_activate, 
+//GO(gtk_action_block_activate, 
+//GO(gtk_action_block_activate_from, 
+//GO(gtk_action_connect_accelerator, 
+//GO(gtk_action_connect_proxy, 
+//GO(gtk_action_create_icon, 
+//GO(gtk_action_create_menu, 
+//GO(gtk_action_create_menu_item, 
+//GO(gtk_action_create_tool_item, 
+//GO(gtk_action_disconnect_accelerator, 
+//GO(gtk_action_disconnect_proxy, 
+//GO(gtk_action_get_accel_closure, 
+//GO(gtk_action_get_accel_path, 
+//GO(gtk_action_get_always_show_image, 
+//GO(gtk_action_get_gicon, 
+//GO(gtk_action_get_icon_name, 
+//GO(gtk_action_get_is_important, 
+//GO(gtk_action_get_label, 
+//GO(gtk_action_get_name, 
+//GO(gtk_action_get_proxies, 
+//GO(gtk_action_get_sensitive, 
+//GO(gtk_action_get_short_label, 
+//GO(gtk_action_get_stock_id, 
+//GO(gtk_action_get_tooltip, 
+GO(gtk_action_get_type, iFv)
+//GO(gtk_action_get_visible, 
+//GO(gtk_action_get_visible_horizontal, 
+//GO(gtk_action_get_visible_vertical, 
+//GO(gtk_action_group_add_action, 
+//GO(gtk_action_group_add_actions, 
+//GO(gtk_action_group_add_actions_full, 
+//GO(gtk_action_group_add_action_with_accel, 
+//GO(gtk_action_group_add_radio_actions, 
+//GO(gtk_action_group_add_radio_actions_full, 
+//GO(gtk_action_group_add_toggle_actions, 
+//GO(gtk_action_group_add_toggle_actions_full, 
+//GO(gtk_action_group_get_action, 
+//GO(gtk_action_group_get_name, 
+//GO(gtk_action_group_get_sensitive, 
+GO(gtk_action_group_get_type, iFv)
+//GO(gtk_action_group_get_visible, 
+//GO(gtk_action_group_list_actions, 
+//GO(gtk_action_group_new, 
+//GO(gtk_action_group_remove_action, 
+//GO(gtk_action_group_set_sensitive, 
+//GO(gtk_action_group_set_translate_func, 
+//GO(gtk_action_group_set_translation_domain, 
+//GO(gtk_action_group_set_visible, 
+//GO(gtk_action_group_translate_string, 
+//GO(gtk_action_is_sensitive, 
+//GO(gtk_action_is_visible, 
+//GO(gtk_action_new, 
+//GO(gtk_action_set_accel_group, 
+//GO(gtk_action_set_accel_path, 
+//GO(gtk_action_set_always_show_image, 
+//GO(gtk_action_set_gicon, 
+//GO(gtk_action_set_icon_name, 
+//GO(gtk_action_set_is_important, 
+//GO(gtk_action_set_label, 
+//GO(gtk_action_set_sensitive, 
+//GO(gtk_action_set_short_label, 
+//GO(gtk_action_set_stock_id, 
+//GO(gtk_action_set_tooltip, 
+//GO(gtk_action_set_visible, 
+//GO(gtk_action_set_visible_horizontal, 
+//GO(gtk_action_set_visible_vertical, 
+//GO(gtk_action_unblock_activate, 
+//GO(gtk_action_unblock_activate_from, 
+//GO(gtk_activatable_do_set_related_action, 
+//GO(gtk_activatable_get_related_action, 
+GO(gtk_activatable_get_type, iFv)
+//GO(gtk_activatable_get_use_action_appearance, 
+//GO(gtk_activatable_set_related_action, 
+//GO(gtk_activatable_set_use_action_appearance, 
+//GO(gtk_activatable_sync_action_properties, 
+GO(gtk_adjustment_changed, vFp)
+GO(gtk_adjustment_clamp_page, vFpdd)
+GO(gtk_adjustment_configure, vFpdddddd)
+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, iFv)
+GO(gtk_adjustment_get_upper, dFp)
+GO(gtk_adjustment_get_value, dFp)
+GO(gtk_adjustment_new, pFdddddd)
+GO(gtk_adjustment_set_lower, vFpd)
+GO(gtk_adjustment_set_page_increment, vFp)
+GO(gtk_adjustment_set_page_size, vFpd)
+GO(gtk_adjustment_set_step_increment, vFpd)
+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, iFv)
+GO(gtk_alignment_new, pFffff)
+GO(gtk_alignment_set, vFpffff)
+GO(gtk_alignment_set_padding, vFpuuuu)
+GO(gtk_alternative_dialog_button_order, iFp)
+GO(gtk_anchor_type_get_type, iFv)
+GO(gtk_arg_flags_get_type, iFv)
+GO(gtk_arrow_get_type, iFv)
+GO(gtk_arrow_new, pFii)
+GO(gtk_arrow_placement_get_type, iFv)
+GO(gtk_arrow_set, vFpii)
+GO(gtk_arrow_type_get_type, iFv)
+GO(gtk_aspect_frame_get_type, iFv)
+//GO(gtk_aspect_frame_new, 
+//GO(gtk_aspect_frame_set, 
+//GO(gtk_assistant_add_action_widget, 
+//GO(gtk_assistant_append_page, 
+//GO(gtk_assistant_commit, 
+//GO(gtk_assistant_get_current_page, 
+//GO(gtk_assistant_get_n_pages, 
+//GO(gtk_assistant_get_nth_page, 
+//GO(gtk_assistant_get_page_complete, 
+//GO(gtk_assistant_get_page_header_image, 
+//GO(gtk_assistant_get_page_side_image, 
+//GO(gtk_assistant_get_page_title, 
+//GO(gtk_assistant_get_page_type, 
+GO(gtk_assistant_get_type, iFv)
+//GO(gtk_assistant_insert_page, 
+//GO(gtk_assistant_new, 
+GO(gtk_assistant_page_type_get_type, iFv)
+//GO(gtk_assistant_prepend_page, 
+//GO(gtk_assistant_remove_action_widget, 
+//GO(gtk_assistant_set_current_page, 
+//GO(gtk_assistant_set_forward_page_func, 
+//GO(gtk_assistant_set_page_complete, 
+//GO(gtk_assistant_set_page_header_image, 
+//GO(gtk_assistant_set_page_side_image, 
+//GO(gtk_assistant_set_page_title, 
+//GO(gtk_assistant_set_page_type, 
+//GO(gtk_assistant_update_buttons_state, 
+GO(gtk_attach_options_get_type, iFv)
+//GO(gtk_binding_entry_add_signal, 
+//GO(gtk_binding_entry_add_signall, 
+//GO(gtk_binding_entry_clear, 
+//GO(gtk_binding_entry_remove, 
+//GO(gtk_binding_entry_skip, 
+//GO(gtk_binding_parse_binding, 
+//GO(gtk_bindings_activate, 
+//GO(gtk_bindings_activate_event, 
+//GO(gtk_binding_set_activate, 
+//GO(gtk_binding_set_add_path, 
+//GO(gtk_binding_set_by_class, 
+//GO(gtk_binding_set_find, 
+//GO(gtk_binding_set_new, 
+GO(gtk_bin_get_child, pFp)
+GO(gtk_bin_get_type, iFv)
+GO(gtk_border_copy, pFp)
+GO(gtk_border_free, vFp)
+GO(gtk_border_get_type, iFv)
+GO(gtk_border_new, pFv)
+GO(gtk_box_get_homogeneous, iFp)
+GO(gtk_box_get_spacing, iFp)
+GO(gtk_box_get_type, iFv)
+GO(gtk_box_new, pFii)
+GO(gtk_box_pack_end, vFppiiu)
+GO(gtk_box_pack_end_defaults, vFpp)
+GO(gtk_box_pack_start, vFppiiu)
+GO(gtk_box_pack_start_defaults, vFpp)
+GO(gtk_box_query_child_packing, vFpppppp)
+GO(gtk_box_reorder_child, vFppi)
+GO(gtk_box_set_child_packing, vFppiiui)
+GO(gtk_box_set_homogeneous, vFpi)
+GO(gtk_box_set_spacing, vFpi)
+GO(gtk_buildable_add_child, vFpppp)
+GO(gtk_buildable_construct_child, pFppp)
+GO(gtk_buildable_custom_finished, vFppppp)
+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, iFv)
+GO(gtk_buildable_parser_finished, vFpp)
+GO(gtk_buildable_set_buildable_property, vFpppp)
+GO(gtk_buildable_set_name, vFpp)
+GO(gtk_builder_add_from_file, uFppp)
+GO(gtk_builder_add_from_resource, uFppp)
+GO(gtk_builder_add_from_string, iFppLp)
+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, iFv)
+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, iFv)
+GO(gtk_builder_get_type_from_name, iFpp)
+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, iFpippp)
+GO(gtk_button_action_get_type, iFv)
+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, iFp)
+GO(gtk_button_box_get_type, iFv)
+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, vFpi)
+GO(gtk_button_box_style_get_type, iFv)
+//GO(gtk_button_clicked, 
+//GO(gtk_button_enter, 
+GO(gtk_button_get_alignment, vFppp)
+GO(gtk_button_get_event_window, pFp)
+GO(gtk_button_get_focus_on_click, iFp)
+GO(gtk_button_get_image, pFp)
+GO(gtk_button_get_image_position, iFp)
+GO(gtk_button_get_label, pFp)
+GO(gtk_button_get_relief, iFp)
+GO(gtk_button_get_type, iFv)
+GO(gtk_button_get_use_stock, iFp)
+GO(gtk_button_get_use_underline, iFp)
+GO(gtk_button_leave, vFp)
+GO(gtk_button_new, pFv)
+GO(gtk_button_new_from_stock, pFp)
+GO(gtk_button_new_with_label, pFp)
+GO(gtk_button_new_with_mnemonic, pFp)
+GO(gtk_button_pressed, vFp)
+GO(gtk_button_released, vFp)
+GO(gtk_button_set_alignment, vFpff)
+GO(gtk_button_set_focus_on_click, vFpi)
+GO(gtk_button_set_image, vFpp)
+GO(gtk_button_set_image_position, vFpi)
+GO(gtk_button_set_label, vFpp)
+GO(gtk_button_set_relief, vFpi)
+GO(gtk_button_set_use_stock, vFpi)
+GO(gtk_button_set_use_underline, vFpi)
+GO(gtk_buttons_type_get_type, iFv)
+//GO(gtk_calendar_clear_marks, 
+//GO(gtk_calendar_display_options, 
+GO(gtk_calendar_display_options_get_type, iFv)
+//GO(gtk_calendar_freeze, 
+//GO(gtk_calendar_get_date, 
+//GO(gtk_calendar_get_detail_height_rows, 
+//GO(gtk_calendar_get_detail_width_chars, 
+//GO(gtk_calendar_get_display_options, 
+GO(gtk_calendar_get_type, iFv)
+//GO(gtk_calendar_mark_day, 
+//GO(gtk_calendar_new, 
+//GO(gtk_calendar_select_day, 
+//GO(gtk_calendar_select_month, 
+//GO(gtk_calendar_set_detail_func, 
+//GO(gtk_calendar_set_detail_height_rows, 
+//GO(gtk_calendar_set_detail_width_chars, 
+//GO(gtk_calendar_set_display_options, 
+//GO(gtk_calendar_thaw, 
+//GO(gtk_calendar_unmark_day, 
+//GO(gtk_cell_editable_editing_done, 
+GO(gtk_cell_editable_get_type, iFv)
+//GO(gtk_cell_editable_remove_widget, 
+//GO(gtk_cell_editable_start_editing, 
+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, iFv)
+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, iFv)
+GO(gtk_cell_renderer_accel_mode_get_type, iFv)
+//GO(gtk_cell_renderer_accel_new, 
+//GO(gtk_cell_renderer_activate, 
+GO(gtk_cell_renderer_combo_get_type, iFv)
+//GO(gtk_cell_renderer_combo_new, 
+//GO(gtk_cell_renderer_editing_canceled, 
+//GO(gtk_cell_renderer_get_alignment, 
+//GO(gtk_cell_renderer_get_fixed_size, 
+//GO(gtk_cell_renderer_get_padding, 
+//GO(gtk_cell_renderer_get_sensitive, 
+//GO(gtk_cell_renderer_get_size, 
+GO(gtk_cell_renderer_get_type, iFv)
+//GO(gtk_cell_renderer_get_visible, 
+GO(gtk_cell_renderer_mode_get_type, iFv)
+GO(gtk_cell_renderer_pixbuf_get_type, iFv)
+GO(gtk_cell_renderer_pixbuf_new, pFv)
+GO(gtk_cell_renderer_progress_get_type, iFv)
+//GO(gtk_cell_renderer_progress_new, 
+//GO(gtk_cell_renderer_render, 
+//GO(gtk_cell_renderer_set_alignment, 
+//GO(gtk_cell_renderer_set_fixed_size, 
+//GO(gtk_cell_renderer_set_padding, 
+//GO(gtk_cell_renderer_set_sensitive, 
+//GO(gtk_cell_renderer_set_visible, 
+GO(gtk_cell_renderer_spin_get_type, iFv)
+GO(gtk_cell_renderer_spinner_get_type, iFv)
+//GO(gtk_cell_renderer_spinner_new, 
+//GO(gtk_cell_renderer_spin_new, 
+//GO(gtk_cell_renderer_start_editing, 
+GO(gtk_cell_renderer_state_get_type, iFv)
+//GO(gtk_cell_renderer_stop_editing, 
+GO(gtk_cell_renderer_text_get_type, iFv)
+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, iFv)
+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, iFv)
+//GO(gtk_cell_view_get_cell_renderers, 
+//GO(gtk_cell_view_get_displayed_row, 
+//GO(gtk_cell_view_get_model, 
+//GO(gtk_cell_view_get_size_of_row, 
+GO(gtk_cell_view_get_type, iFv)
+//GO(gtk_cell_view_new, 
+//GO(gtk_cell_view_new_with_markup, 
+//GO(gtk_cell_view_new_with_pixbuf, 
+//GO(gtk_cell_view_new_with_text, 
+//GO(gtk_cell_view_set_background_color, 
+//GO(gtk_cell_view_set_displayed_row, 
+//GO(gtk_cell_view_set_model, 
+GO(gtk_check_button_get_type, iFv)
+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, iFv)
+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)
+GO(gtk_check_menu_item_set_active, vFpi)
+GO(gtk_check_menu_item_set_draw_as_radio, vFpi)
+GO(gtk_check_menu_item_set_inconsistent, vFpi)
+GO(gtk_check_menu_item_set_show_toggle, vFpi)
+GO(gtk_check_menu_item_toggled, vFp)
+GO(gtk_check_version, pFuuu)
+GO(gtk_clipboard_clear, vFp)
+GO(gtk_clipboard_get, 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, iFv)
+//GOM(gtk_clipboard_request_contents, vFEpppp)
+//GOM(gtk_clipboard_request_image, vFEppp)
+//GOM(gtk_clipboard_request_rich_text, vFEpppp)
+//GOM(gtk_clipboard_request_targets, vFEppp)
+//GOM(gtk_clipboard_request_text, vFEppp)
+//GOM(gtk_clipboard_request_uris, vFEppp)
+GO(gtk_clipboard_set_can_store, vFppp)
+GO(gtk_clipboard_set_image, vFpp)
+GO(gtk_clipboard_set_text, vFppi)
+GOM(gtk_clipboard_set_with_data, iFEppuppp)
+GOM(gtk_clipboard_set_with_owner, iFEppuppp)
+GO(gtk_clipboard_store, vFp)
+GO(gtk_clipboard_wait_for_contents, pFpp)
+GO(gtk_clipboard_wait_for_image, pFp)
+GO(gtk_clipboard_wait_for_rich_text, pFpppp)
+GO(gtk_clipboard_wait_for_targets, iFppp)
+GO(gtk_clipboard_wait_for_text, pFp)
+GO(gtk_clipboard_wait_for_uris, pFp)
+GO(gtk_clipboard_wait_is_image_available, iFp)
+GO(gtk_clipboard_wait_is_rich_text_available, iFpp)
+GO(gtk_clipboard_wait_is_target_available, iFpp)
+GO(gtk_clipboard_wait_is_text_available, iFp)
+GO(gtk_clipboard_wait_is_uris_available, iFp)
+GO(gtk_clist_append, iFpp)
+GO(gtk_clist_clear, vFp)
+GO(gtk_clist_columns_autosize, iFp)
+GO(gtk_clist_column_title_active, vFpi)
+GO(gtk_clist_column_title_passive, vFpi)
+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, iFv)
+GO(gtk_clist_find_row_from_data, iFpp)
+GO(gtk_clist_freeze, vFp)
+GO(gtk_clist_get_cell_style, pFpii)
+GO(gtk_clist_get_cell_type, iFpii)
+GO(gtk_clist_get_column_title, pFpi)
+GO(gtk_clist_get_column_widget, pFpi)
+GO(gtk_clist_get_hadjustment, pFp)
+GO(gtk_clist_get_pixmap, iFpiipp)
+GO(gtk_clist_get_pixtext, iFpiipppp)
+GO(gtk_clist_get_row_data, pFpi)
+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, iFv)
+GO(gtk_clist_get_vadjustment, pFp)
+GO(gtk_clist_insert, iFpip)
+GO(gtk_clist_moveto, vFpiiff)
+GO(gtk_clist_new, pFi)
+GO(gtk_clist_new_with_titles, pFip)
+GO(gtk_clist_optimal_column_width, iFpi)
+GO(gtk_clist_prepend, iFpp)
+GO(gtk_clist_remove, vFpi)
+GO(gtk_clist_row_is_visible, iFpi)
+GO(gtk_clist_row_move, vFpii)
+GO(gtk_clist_select_all, vFp)
+GO(gtk_clist_select_row, vFpii)
+GO(gtk_clist_set_auto_sort, vFpi)
+GO(gtk_clist_set_background, vFpip)
+GO(gtk_clist_set_button_actions, vFpiC)
+GO(gtk_clist_set_cell_style, vFpiip)
+GO(gtk_clist_set_column_auto_resize, iFpi)
+GO(gtk_clist_set_column_justification, vFpii)
+GO(gtk_clist_set_column_max_width, vFpii)
+GO(gtk_clist_set_column_min_width, vFpii)
+GO(gtk_clist_set_column_resizeable, vFpii)
+GO(gtk_clist_set_column_title, vFpip)
+GO(gtk_clist_set_column_visibility, vFpii)
+GO(gtk_clist_set_column_widget, vFpip)
+GO(gtk_clist_set_column_width, vFpii)
+//GOM(gtk_clist_set_compare_func, vFEpp)
+GO(gtk_clist_set_foreground, vFpip)
+GO(gtk_clist_set_hadjustment, vFpp)
+GO(gtk_clist_set_pixmap, vFpiipp)
+GO(gtk_clist_set_pixtext, vFpiipCpp)
+GO(gtk_clist_set_reorderable, vFpi)
+GO(gtk_clist_set_row_data, vFpip)
+//GOM(gtk_clist_set_row_data_full, vFpipp)
+GO(gtk_clist_set_row_height, vFpu)
+GO(gtk_clist_set_row_style, vFpip)
+GO(gtk_clist_set_selectable, vFpii)
+GO(gtk_clist_set_selection_mode, vFpi)
+GO(gtk_clist_set_shadow_type, vFpi)
+GO(gtk_clist_set_shift, vFpiiii)
+GO(gtk_clist_set_sort_column, vFpi)
+GO(gtk_clist_set_sort_type, vFpi)
+GO(gtk_clist_set_text, vFpiip)
+GO(gtk_clist_set_use_drag_icons, vFpi)
+GO(gtk_clist_set_vadjustment, vFpp)
+GO(gtk_clist_sort, vFp)
+GO(gtk_clist_swap_rows, vFpii)
+GO(gtk_clist_thaw, vFp)
+GO(gtk_clist_undo_selection, vFp)
+GO(gtk_clist_unselect_all, vFp)
+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, iFv)
+GO(gtk_color_button_get_use_alpha, iFp)
+GO(gtk_color_button_new, pFv)
+GO(gtk_color_button_new_with_color, pFp)
+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_selection_dialog_get_color_selection, pFp)
+GO(gtk_color_selection_dialog_get_type, iFv)
+GO(gtk_color_selection_dialog_new, pFp)
+GO(gtk_color_selection_get_color, vFpp)
+GO(gtk_color_selection_get_current_alpha, WFp)
+GO(gtk_color_selection_get_current_color, vFpp)
+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, iFv)
+GO(gtk_color_selection_is_adjusting, iFp)
+GO(gtk_color_selection_new, pFv)
+GO(gtk_color_selection_palette_from_string, iFppp)
+GO(gtk_color_selection_palette_to_string, pFpi)
+//GOM(gtk_color_selection_set_change_palette_hook, pFEp)
+//GOM(gtk_color_selection_set_change_palette_with_screen_hook, pFEp)
+GO(gtk_color_selection_set_color, vFpp)
+GO(gtk_color_selection_set_current_alpha, vFpW)
+GO(gtk_color_selection_set_current_color, vFpp)
+GO(gtk_color_selection_set_has_opacity_control, vFpi)
+GO(gtk_color_selection_set_has_palette, vFpi)
+GO(gtk_color_selection_set_previous_alpha, vFpW)
+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, iFv)
+GO(gtk_combo_box_entry_new, pFv)
+GO(gtk_combo_box_entry_new_text, pFv)
+GO(gtk_combo_box_entry_new_with_model, pFpi)
+GO(gtk_combo_box_entry_set_text_column, vFpi)
+GO(gtk_combo_box_get_active, iFp)
+GO(gtk_combo_box_get_active_iter, iFpp)
+GO(gtk_combo_box_get_active_text, pFp)
+GO(gtk_combo_box_get_add_tearoffs, iFp)
+GO(gtk_combo_box_get_button_sensitivity, iFp)
+GO(gtk_combo_box_get_column_span_column, iFp)
+GO(gtk_combo_box_get_entry_text_column, iFp)
+GO(gtk_combo_box_get_focus_on_click, iFp)
+GO(gtk_combo_box_get_has_entry, iFp)
+GO(gtk_combo_box_get_model, pFp)
+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, iFv)
+GO(gtk_combo_box_get_wrap_width, iFp)
+GO(gtk_combo_box_insert_text, vFpip)
+GO(gtk_combo_box_new, pFv)
+GO(gtk_combo_box_new_text, pFv)
+GO(gtk_combo_box_new_with_entry, pFv)
+GO(gtk_combo_box_new_with_model, pFp)
+GO(gtk_combo_box_new_with_model_and_entry, pFp)
+GO(gtk_combo_box_popdown, vFp)
+GO(gtk_combo_box_popup, vFp)
+GO(gtk_combo_box_prepend_text, vFpp)
+GO(gtk_combo_box_remove_text, vFpi)
+GO(gtk_combo_box_set_active, vFpi)
+GO(gtk_combo_box_set_active_iter, vFpp)
+GO(gtk_combo_box_set_add_tearoffs, vFpi)
+GO(gtk_combo_box_set_button_sensitivity, vFpi)
+GO(gtk_combo_box_set_column_span_column, vFpi)
+GO(gtk_combo_box_set_entry_text_column, vFpi)
+GO(gtk_combo_box_set_focus_on_click, vFpi)
+GO(gtk_combo_box_set_model, vFpp)
+//GOM(gtk_combo_box_set_row_separator_func, vFEpppp)
+GO(gtk_combo_box_set_row_span_column, vFpi)
+GO(gtk_combo_box_set_title, vFpp)
+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, iFv)
+GO(gtk_combo_box_text_insert_text, vFpip)
+GO(gtk_combo_box_text_new, pFv)
+GO(gtk_combo_box_text_new_with_entry, pFv)
+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, iFv)
+GO(gtk_combo_new, pFv)
+GO(gtk_combo_set_case_sensitive, vFpi)
+GO(gtk_combo_set_item_string, vFppp)
+GO(gtk_combo_set_popdown_strings, vFpp)
+GO(gtk_combo_set_use_arrows, vFpi)
+GO(gtk_combo_set_use_arrows_always, vFpi)
+GO(gtk_combo_set_value_in_list, vFpii)
+GO(gtk_container_add, vFpp)
+GO(gtk_container_add_with_properties, vFpppppppppppp)    //vaarg
+GO(gtk_container_check_resize, vFp)
+//GO2(gtk_container_child_get, vFpppV, gtk_container_child_get_valist)
+GO(gtk_container_child_get_property, vFpppp)
+//GO(gtk_container_child_get_valist, vFpppp)
+//GO2(gtk_container_child_set, vFpppV, gtk_container_child_set_valist)
+GO(gtk_container_child_set_property, vFpppp)
+//GO(gtk_container_child_set_valist, vFpppp)
+GO(gtk_container_child_type, iFp)
+GO(gtk_container_class_find_child_property, pFpp)
+GO(gtk_container_class_install_child_property, vFpup)
+GO(gtk_container_class_list_child_properties, pFpp)
+GOM(gtk_container_forall, vFEppp)
+//GOM(gtk_container_foreach, vFEppp)
+//GOM(gtk_container_foreach_full, vFEppppp)
+GO(gtk_container_get_border_width, uFp)
+GO(gtk_container_get_children, pFp)
+GO(gtk_container_get_focus_chain, iFpp)
+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, iFp)
+GO(gtk_container_get_type, iFv)
+GO(gtk_container_propagate_expose, vFppp)
+GO(gtk_container_remove, vFpp)
+GO(gtk_container_resize_children, vFp)
+GO(gtk_container_set_border_width, vFpu)
+GO(gtk_container_set_focus_chain, vFpp)
+GO(gtk_container_set_focus_child, vFpp)
+GO(gtk_container_set_focus_hadjustment, vFpp)
+GO(gtk_container_set_focus_vadjustment, vFpp)
+GO(gtk_container_set_reallocate_redraws, vFpp)
+GO(gtk_container_set_resize_mode, vFpi)
+GO(gtk_container_unset_focus_chain, vFp)
+GO(gtk_corner_type_get_type, iFv)
+GO(gtk_css_provider_get_default, pFv)
+GO(gtk_css_provider_get_named, pFpp)
+GO(gtk_css_provider_load_from_data, iFpplp)
+GO(gtk_css_provider_load_from_file, iFppp)
+GO(gtk_css_provider_load_from_path, iFppp)
+GO(gtk_css_provider_load_from_resource, vFpp)
+GO(gtk_css_provider_new, pFv)
+GO(gtk_css_provider_to_string, pFp)
+GO(gtk_css_section_get_end_line, uFp)
+GO(gtk_css_section_get_end_position, uFp)
+GO(gtk_css_section_get_file, pFp)
+GO(gtk_css_section_get_parent, pFp)
+GO(gtk_css_section_get_section_type, iFp)
+GO(gtk_css_section_get_start_line, uFp)
+GO(gtk_css_section_get_start_position, uFp)
+GO(gtk_css_section_ref, pFp)
+GO(gtk_css_section_unref, vFp)
+//GO(gtk_ctree_collapse, 
+//GO(gtk_ctree_collapse_recursive, 
+//GO(gtk_ctree_collapse_to_depth, 
+//GO(gtk_ctree_expand, 
+GO(gtk_ctree_expander_style_get_type, iFv)
+//GO(gtk_ctree_expand_recursive, 
+//GO(gtk_ctree_expand_to_depth, 
+GO(gtk_ctree_expansion_type_get_type, iFv)
+//GO(gtk_ctree_export_to_gnode, 
+//GO(gtk_ctree_find, 
+//GO(gtk_ctree_find_all_by_row_data, 
+//GO(gtk_ctree_find_all_by_row_data_custom, 
+//GO(gtk_ctree_find_by_row_data, 
+//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, iFv)
+//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, iFv)
+//GO(gtk_ctree_move, 
+//GO(gtk_ctree_new, 
+//GO(gtk_ctree_new_with_titles, 
+//GO(gtk_ctree_node_get_cell_style, 
+//GO(gtk_ctree_node_get_cell_type, 
+//GO(gtk_ctree_node_get_pixmap, 
+//GO(gtk_ctree_node_get_pixtext, 
+//GO(gtk_ctree_node_get_row_data, 
+//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, iFv)
+//GO(gtk_ctree_node_is_visible, 
+//GO(gtk_ctree_node_moveto, 
+//GO(gtk_ctree_node_nth, 
+//GO(gtk_ctree_node_set_background, 
+//GO(gtk_ctree_node_set_cell_style, 
+//GO(gtk_ctree_node_set_foreground, 
+//GO(gtk_ctree_node_set_pixmap, 
+//GO(gtk_ctree_node_set_pixtext, 
+//GO(gtk_ctree_node_set_row_data, 
+//GO(gtk_ctree_node_set_row_data_full, 
+//GO(gtk_ctree_node_set_row_style, 
+//GO(gtk_ctree_node_set_selectable, 
+//GO(gtk_ctree_node_set_shift, 
+//GO(gtk_ctree_node_set_text, 
+GO(gtk_ctree_pos_get_type, iFv)
+//GO(gtk_ctree_post_recursive, 
+//GO(gtk_ctree_post_recursive_to_depth, 
+//GO(gtk_ctree_pre_recursive, 
+//GO(gtk_ctree_pre_recursive_to_depth, 
+//GO(gtk_ctree_real_select_recursive, 
+//GO(gtk_ctree_remove_node, 
+//GO(gtk_ctree_select, 
+//GO(gtk_ctree_select_recursive, 
+//GO(gtk_ctree_set_drag_compare_func, 
+//GO(gtk_ctree_set_expander_style, 
+//GO(gtk_ctree_set_indent, 
+//GO(gtk_ctree_set_line_style, 
+//GO(gtk_ctree_set_node_info, 
+//GO(gtk_ctree_set_show_stub, 
+//GO(gtk_ctree_set_spacing, 
+//GO(gtk_ctree_sort_node, 
+//GO(gtk_ctree_sort_recursive, 
+//GO(gtk_ctree_toggle_expansion, 
+//GO(gtk_ctree_toggle_expansion_recursive, 
+//GO(gtk_ctree_unselect, 
+//GO(gtk_ctree_unselect_recursive, 
+GO(gtk_curve_get_type, iFv)
+GO(gtk_curve_get_vector, vFpip)
+GO(gtk_curve_new, pFv)
+GO(gtk_curve_reset, vFp)
+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, iFv)
+GO(gtk_custom_paper_unix_dialog_get_type, iFv)
+GO(gtk_debug_flag_get_type, iFv)
+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, iFv)
+GO(gtk_dest_defaults_get_type, iFv)
+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, iFv)
+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, iFv)
+GO(gtk_dialog_get_widget_for_response, pFpi)
+GO(gtk_dialog_new, pFv)
+GO(gtk_dialog_new_with_buttons, pFppipppppppppppp)    //vaarg
+GO(gtk_dialog_response, vFpi)
+GO(gtk_dialog_run, iFp)
+GO(gtk_dialog_set_alternative_button_order, vFpiiiiiiiiiiiiiiiiii)  // vaarg, should wrap using gtk_dialog_set_alternative_button_order_from_array
+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, iFv)
+GO(gtk_disable_setlocale, vFv)
+GO(gtk_distribute_natural_allocation, iFpup)
+GO(gtk_drag_begin, pFppiip)
+GO(gtk_drag_check_threshold, iFpiiii)
+GO(gtk_drag_dest_add_image_targets, vFp)
+GO(gtk_drag_dest_add_text_targets, vFp)
+GO(gtk_drag_dest_add_uri_targets, vFp)
+GO(gtk_drag_dest_find_target, pFppp)
+GO(gtk_drag_dest_get_target_list, pFp)
+GO(gtk_drag_dest_get_track_motion, iFp)
+GO(gtk_drag_dest_set, vFpipii)
+GO(gtk_drag_dest_set_proxy, vFppii)
+GO(gtk_drag_dest_set_target_list, vFpp)
+GO(gtk_drag_dest_set_track_motion, vFpi)
+GO(gtk_drag_dest_unset, vFp)
+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, iFv)
+GO(gtk_drag_set_default_icon, vFpppii)
+GO(gtk_drag_set_icon_default, vFp)
+GO(gtk_drag_set_icon_name, vFppii)
+GO(gtk_drag_set_icon_pixbuf, vFppii)
+GO(gtk_drag_set_icon_pixmap, vFppppii)
+GO(gtk_drag_set_icon_stock, vFppii)
+GO(gtk_drag_set_icon_widget, vFppii)
+GO(gtk_drag_source_add_image_targets, vFp)
+GO(gtk_drag_source_add_text_targets, vFp)
+GO(gtk_drag_source_add_uri_targets, vFp)
+GO(gtk_drag_source_get_target_list, pFp)
+GO(gtk_drag_source_set, vFpipii)
+GO(gtk_drag_source_set_icon, vFpppp)
+GO(gtk_drag_source_set_icon_name, vFpp)
+GO(gtk_drag_source_set_icon_pixbuf, vFpp)
+GO(gtk_drag_source_set_icon_stock, vFpp)
+GO(gtk_drag_source_set_target_list, vFpp)
+GO(gtk_drag_source_unset, vFp)
+GO(gtk_drag_unhighlight, vFp)
+GO(gtk_draw_arrow, vFppiiiiiiii)
+GO(gtk_draw_box, vFppiiiiii)
+GO(gtk_draw_box_gap, vFppiiiiiiiii)
+GO(gtk_draw_check, vFppiiiiii)
+GO(gtk_draw_diamond, vFppiiiiii)
+GO(gtk_draw_expander, vFppiiii)
+GO(gtk_draw_extension, vFppiiiiiii)
+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, iFv)
+GO(gtk_drawing_area_new, pFv)
+GO(gtk_drawing_area_size, vFpii)
+GO(gtk_draw_insertion_cursor, vFppppiii)
+GO(gtk_draw_layout, vFppiiiip)
+GO(gtk_draw_option, vFppiiiiii)
+GO(gtk_draw_polygon, vFppiipii)
+GO(gtk_draw_resize_grip, vFppiiiiii)
+GO(gtk_draw_shadow, vFppiiiiii)
+GO(gtk_draw_shadow_gap, vFppiiiiiiiii)
+GO(gtk_draw_slider, vFppiiiiiii)
+GO(gtk_draw_string, vFppiiip)
+GO(gtk_draw_tab, vFppiiiiii)
+GO(gtk_draw_vline, vFppiiii)
+GO(gtk_editable_copy_clipboard, vFp)
+GO(gtk_editable_cut_clipboard, vFp)
+GO(gtk_editable_delete_selection, vFp)
+GO(gtk_editable_delete_text, vFpii)
+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, iFv)
+GO(gtk_editable_insert_text, vFppip)
+GO(gtk_editable_paste_clipboard, vFp)
+GO(gtk_editable_select_region, vFpii)
+GO(gtk_editable_set_editable, vFpi)
+GO(gtk_editable_set_position, vFpi)
+GO(gtk_entry_append_text, vFpp)
+//GO(gtk_entry_buffer_delete_text, 
+//GO(gtk_entry_buffer_emit_deleted_text, 
+//GO(gtk_entry_buffer_emit_inserted_text, 
+//GO(gtk_entry_buffer_get_bytes, 
+//GO(gtk_entry_buffer_get_length, 
+//GO(gtk_entry_buffer_get_max_length, 
+//GO(gtk_entry_buffer_get_text, 
+GO(gtk_entry_buffer_get_type, iFv)
+//GO(gtk_entry_buffer_insert_text, 
+//GO(gtk_entry_buffer_new, 
+//GO(gtk_entry_buffer_set_max_length, 
+//GO(gtk_entry_buffer_set_text, 
+//GO(gtk_entry_completion_complete, 
+//GO(gtk_entry_completion_delete_action, 
+//GO(gtk_entry_completion_get_completion_prefix, 
+//GO(gtk_entry_completion_get_entry, 
+//GO(gtk_entry_completion_get_inline_completion, 
+//GO(gtk_entry_completion_get_inline_selection, 
+//GO(gtk_entry_completion_get_minimum_key_length, 
+//GO(gtk_entry_completion_get_model, 
+//GO(gtk_entry_completion_get_popup_completion, 
+//GO(gtk_entry_completion_get_popup_set_width, 
+//GO(gtk_entry_completion_get_popup_single_match, 
+//GO(gtk_entry_completion_get_text_column, 
+GO(gtk_entry_completion_get_type, iFv)
+//GO(gtk_entry_completion_insert_action_markup, 
+//GO(gtk_entry_completion_insert_action_text, 
+//GO(gtk_entry_completion_insert_prefix, 
+//GO(gtk_entry_completion_new, 
+//GO(gtk_entry_completion_set_inline_completion, 
+//GO(gtk_entry_completion_set_inline_selection, 
+//GO(gtk_entry_completion_set_match_func, 
+//GO(gtk_entry_completion_set_minimum_key_length, 
+//GO(gtk_entry_completion_set_model, 
+//GO(gtk_entry_completion_set_popup_completion, 
+//GO(gtk_entry_completion_set_popup_set_width, 
+//GO(gtk_entry_completion_set_popup_single_match, 
+//GO(gtk_entry_completion_set_text_column, 
+GO(gtk_entry_get_activates_default, iFp)
+GO(gtk_entry_get_alignment, fFp)
+//GO(gtk_entry_get_buffer, 
+//GO(gtk_entry_get_completion, 
+//GO(gtk_entry_get_current_icon_drag_source, 
+//GO(gtk_entry_get_cursor_hadjustment, 
+GO(gtk_entry_get_has_frame, iFp)
+//GO(gtk_entry_get_icon_activatable, 
+//GO(gtk_entry_get_icon_at_pos, 
+//GO(gtk_entry_get_icon_gicon, 
+//GO(gtk_entry_get_icon_name, 
+//GO(gtk_entry_get_icon_pixbuf, 
+//GO(gtk_entry_get_icon_sensitive, 
+//GO(gtk_entry_get_icon_stock, 
+//GO(gtk_entry_get_icon_storage_type, 
+//GO(gtk_entry_get_icon_tooltip_markup, 
+//GO(gtk_entry_get_icon_tooltip_text, 
+//GO(gtk_entry_get_icon_window, 
+GO(gtk_entry_get_inner_border, pFp)
+//GO(gtk_entry_get_invisible_char, 
+GO(gtk_entry_get_layout, pFp)
+GO(gtk_entry_get_layout_offsets, vFppp)
+//GO(gtk_entry_get_max_length, 
+GO(gtk_entry_get_overwrite_mode, iFp)
+//GO(gtk_entry_get_progress_fraction, 
+//GO(gtk_entry_get_progress_pulse_step, 
+GO(gtk_entry_get_text, pFp)
+GO(gtk_entry_get_text_length, WFp)
+//GO(gtk_entry_get_text_window, 
+GO(gtk_entry_get_type, iFv)
+//GO(gtk_entry_get_visibility, 
+GO(gtk_entry_get_width_chars, iFp)
+GO(gtk_entry_icon_position_get_type, iFv)
+//GO(gtk_entry_im_context_filter_keypress, 
+//GO(gtk_entry_layout_index_to_text_index, 
+GO(gtk_entry_new, pFv)
+GO(gtk_entry_new_with_buffer, pFp)
+GO(gtk_entry_new_with_max_length, pFi)
+GO(gtk_entry_prepend_text, vFpp)
+//GO(gtk_entry_progress_pulse, 
+//GO(gtk_entry_reset_im_context, 
+GO(gtk_entry_select_region, vFpii)
+GO(gtk_entry_set_activates_default, vFpi)
+GO(gtk_entry_set_alignment, vFpf)
+GO(gtk_entry_set_buffer, vFpp)
+//GO(gtk_entry_set_completion, 
+//GO(gtk_entry_set_cursor_hadjustment, 
+GO(gtk_entry_set_editable, vFpi)
+GO(gtk_entry_set_has_frame, vFpi)
+//GO(gtk_entry_set_icon_activatable, 
+//GO(gtk_entry_set_icon_drag_source, 
+//GO(gtk_entry_set_icon_from_gicon, 
+//GO(gtk_entry_set_icon_from_icon_name, 
+//GO(gtk_entry_set_icon_from_pixbuf, 
+//GO(gtk_entry_set_icon_from_stock, 
+//GO(gtk_entry_set_icon_sensitive, 
+//GO(gtk_entry_set_icon_tooltip_markup, 
+//GO(gtk_entry_set_icon_tooltip_text, 
+GO(gtk_entry_set_inner_border, vFpp)
+GO(gtk_entry_set_invisible_char, vFp)
+GO(gtk_entry_set_max_length, vFpi)
+GO(gtk_entry_set_overwrite_mode, vFpi)
+GO(gtk_entry_set_position, vFpi)
+//GO(gtk_entry_set_progress_fraction, 
+//GO(gtk_entry_set_progress_pulse_step, 
+GO(gtk_entry_set_text, vFpp)
+GO(gtk_entry_set_visibility, vFpi)
+GO(gtk_entry_set_width_chars, uFp)
+//GO(gtk_entry_text_index_to_layout_index, 
+//GO(gtk_entry_unset_invisible_char, 
+//GO(gtk_enumerate_printers, 
+GO(gtk_event_box_get_above_child, iFp)
+GO(gtk_event_box_get_type, iFv)
+GO(gtk_event_box_get_visible_window, iFp)
+GO(gtk_event_box_new, pFv)
+GO(gtk_event_box_set_above_child, vFpi)
+GO(gtk_event_box_set_visible_window, vFpi)
+GO(gtk_events_pending, iFv)
+GO(gtk_exit, vFi)
+GO(gtk_expander_get_expanded, iFp)
+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, iFv)
+GO(gtk_expander_get_use_markup, iFp)
+GO(gtk_expander_get_use_underline, iFp)
+GO(gtk_expander_new, pFp)
+GO(gtk_expander_new_with_mnemonic, pFp)
+GO(gtk_expander_set_expanded, vFpi)
+GO(gtk_expander_set_label, vFpp)
+GO(gtk_expander_set_label_fill, vFpi)
+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, iFv)
+GO(gtk_false, iFv)
+GO(gtk_file_chooser_action_get_type, iFv)
+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, iFv)
+GO(gtk_file_chooser_button_get_width_chars, iFp)
+GO(gtk_file_chooser_button_new, pFpi)
+GO(gtk_file_chooser_button_new_with_backend, pFpip)
+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, iFv)
+GO(gtk_file_chooser_dialog_get_type, iFv)
+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, iFv)
+GO(gtk_file_chooser_error_quark, pFv)
+GO(gtk_file_chooser_get_action, iFp)
+GO(gtk_file_chooser_get_create_folders, iFp)
+GO(gtk_file_chooser_get_current_folder, pFp)
+GO(gtk_file_chooser_get_current_folder_file, pFp)
+GO(gtk_file_chooser_get_current_folder_uri, pFp)
+GO(gtk_file_chooser_get_do_overwrite_confirmation, iFp)
+GO(gtk_file_chooser_get_extra_widget, pFp)
+GO(gtk_file_chooser_get_file, pFp)
+GO(gtk_file_chooser_get_filename, pFp)
+GO(gtk_file_chooser_get_filenames, pFp)
+GO(gtk_file_chooser_get_files, pFp)
+GO(gtk_file_chooser_get_filter, pFp)
+GO(gtk_file_chooser_get_local_only, iFp)
+GO(gtk_file_chooser_get_preview_file, pFp)
+GO(gtk_file_chooser_get_preview_filename, pFp)
+GO(gtk_file_chooser_get_preview_uri, pFp)
+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, iFv)
+GO(gtk_file_chooser_get_uri, pFp)
+GO(gtk_file_chooser_get_uris, pFp)
+GO(gtk_file_chooser_get_use_preview_label, iFp)
+GO(gtk_file_chooser_list_filters, pFp)
+GO(gtk_file_chooser_list_shortcut_folders, pFp)
+GO(gtk_file_chooser_list_shortcut_folder_uris, pFp)
+GO(gtk_file_chooser_remove_filter, vFpp)
+GO(gtk_file_chooser_remove_shortcut_folder, iFppp)
+GO(gtk_file_chooser_remove_shortcut_folder_uri, iFppp)
+GO(gtk_file_chooser_select_all, vFp)
+GO(gtk_file_chooser_select_file, iFppp)
+GO(gtk_file_chooser_select_filename, iFpp)
+GO(gtk_file_chooser_select_uri, iFpp)
+GO(gtk_file_chooser_set_action, vFpi)
+GO(gtk_file_chooser_set_create_folders, vFpi)
+GO(gtk_file_chooser_set_current_folder, iFpp)
+GO(gtk_file_chooser_set_current_folder_file, iFppp)
+GO(gtk_file_chooser_set_current_folder_uri, iFpp)
+GO(gtk_file_chooser_set_current_name, vFpp)
+GO(gtk_file_chooser_set_do_overwrite_confirmation, vFpi)
+GO(gtk_file_chooser_set_extra_widget, vFpp)
+GO(gtk_file_chooser_set_file, iFppp)
+GO(gtk_file_chooser_set_filename, iFpp)
+GO(gtk_file_chooser_set_filter, vFpp)
+GO(gtk_file_chooser_set_local_only, vFpi)
+GO(gtk_file_chooser_set_preview_widget, vFpp)
+GO(gtk_file_chooser_set_preview_widget_active, vFpi)
+GO(gtk_file_chooser_set_select_multiple, vFpi)
+GO(gtk_file_chooser_set_show_hidden, vFpi)
+GO(gtk_file_chooser_set_uri, vFpp)
+GO(gtk_file_chooser_set_use_preview_label, vFpi)
+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, iFv)
+GO(gtk_file_chooser_widget_new, pFi)
+GO(gtk_file_chooser_widget_new_with_backend, pFip)
+//GOM(gtk_file_filter_add_custom, vFEppppp)
+//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, iFv)
+GO(gtk_file_filter_get_name, pFp)
+GO(gtk_file_filter_get_needed, iFp)
+GO(gtk_file_filter_get_type, iFv)
+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, iFv)
+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, iFv)
+GO(gtk_fixed_move, vFppii)
+GO(gtk_fixed_new, pFv)
+GO(gtk_fixed_put, vFppii)
+GO(gtk_fixed_set_has_window, vFpi)
+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, iFv)
+GO(gtk_font_button_get_use_font, iFp)
+GO(gtk_font_button_get_use_size, iFp)
+GO(gtk_font_button_new, pFv)
+GO(gtk_font_button_new_with_font, pFp)
+GO(gtk_font_button_set_font_name, iFpp)
+GO(gtk_font_button_set_show_size, vFpi)
+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_selection_dialog_get_apply_button, pFp)
+GO(gtk_font_selection_dialog_get_cancel_button, pFp)
+GO(gtk_font_selection_dialog_get_font, pFp)
+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, iFv)
+GO(gtk_font_selection_dialog_new, pFp)
+GO(gtk_font_selection_dialog_set_font_name, vFpp)
+GO(gtk_font_selection_dialog_set_preview_text, vFpp)
+GO(gtk_font_selection_get_face, pFp)
+GO(gtk_font_selection_get_face_list, pFp)
+GO(gtk_font_selection_get_family, pFp)
+GO(gtk_font_selection_get_family_list, pFp)
+GO(gtk_font_selection_get_font, pFp)
+GO(gtk_font_selection_get_font_name, pFp)
+GO(gtk_font_selection_get_preview_entry, pFp)
+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, iFv)
+GO(gtk_font_selection_new, pFv)
+GO(gtk_font_selection_set_font_name, iFpp)
+GO(gtk_font_selection_set_preview_text, vFpp)
+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, iFp)
+GO(gtk_frame_get_type, iFv)
+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, vFpi)
+GO(gtk_gamma_curve_get_type, iFv)
+GO(gtk_gamma_curve_new, pFv)
+GO(gtk_gc_get, pFippu)
+GO(gtk_gc_release, vFp)
+GO(gtk_get_current_event, pFv)
+GO(gtk_get_current_event_state, iFp)
+GO(gtk_get_current_event_time, uFv)
+GO(gtk_get_default_language, pFv)
+GO(gtk_get_event_widget, pFp)
+GO(gtk_get_binary_age, uFv)
+GO(gtk_get_interface_age, uFv)
+GO(gtk_get_major_version, uFv)
+GO(gtk_get_minor_version, uFv)
+GO(gtk_get_micro_version, uFv)
+GO(gtk_get_option_group, pFi)
+GO(gtk_grab_add, vFp)
+GO(gtk_grab_get_current, pFv)
+GO(gtk_grab_remove, vFp)
+GO(gtk_handle_box_get_child_detached, iFp)
+GO(gtk_handle_box_get_handle_position, iFp)
+GO(gtk_handle_box_get_shadow_type, iFp)
+GO(gtk_handle_box_get_snap_edge, iFp)
+GO(gtk_handle_box_get_type, iFv)
+GO(gtk_handle_box_new, pFv)
+GO(gtk_handle_box_set_handle_position, vFpi)
+GO(gtk_handle_box_set_shadow_type, vFpi)
+GO(gtk_handle_box_set_snap_edge, vFpi)
+GO(gtk_hbox_get_type, iFv)
+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, iFv)
+GO(gtk_hbutton_box_new, pFv)
+GO(gtk_hbutton_box_set_layout_default, vFi)
+GO(gtk_hbutton_box_set_spacing_default, vFi)
+GO(gtk_header_bar_get_type, lFv)
+GO(gtk_hpaned_get_type, iFv)
+//GO(gtk_hpaned_new, 
+GO(gtk_hruler_get_type, iFv)
+//GO(gtk_hruler_new, 
+GO(gtk_hscale_get_type, iFv)
+GO(gtk_hscale_new, pFp)
+GO(gtk_hscale_new_with_range, pFddd)
+GO(gtk_hscrollbar_get_type, iFv)
+GO(gtk_hscrollbar_new, pFp)
+GO(gtk_hseparator_get_type, iFv)
+GO(gtk_hseparator_new, pFv)
+//GO(gtk_hsv_get_color, 
+//GO(gtk_hsv_get_metrics, 
+GO(gtk_hsv_get_type, iFv)
+//GO(gtk_hsv_is_adjusting, 
+//GO(gtk_hsv_new, 
+//GO(gtk_hsv_set_color, 
+//GO(gtk_hsv_set_metrics, 
+//GO(gtk_hsv_to_rgb, 
+GO(gtk_icon_factory_add, vFppp)
+GO(gtk_icon_factory_add_default, vFp)
+GO(gtk_icon_factory_get_type, iFv)
+GO(gtk_icon_factory_lookup, pFpp)
+GO(gtk_icon_factory_lookup_default, pFp)
+GO(gtk_icon_factory_new, pFv)
+GO(gtk_icon_factory_remove_default, vFp)
+GO(gtk_icon_info_copy, pFp)
+GO(gtk_icon_info_free, vFp)
+GO(gtk_icon_info_get_attach_points, iFppp)
+GO(gtk_icon_info_get_base_size, iFp)
+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, iFv)
+GO(gtk_icon_info_load_icon, pFpp)
+GO(gtk_icon_info_new_for_pixbuf, pFpp)
+GO(gtk_icon_info_set_raw_coordinates, vFpp)
+GO(gtk_icon_lookup_flags_get_type, iFv)
+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, iFv)
+GO(gtk_icon_set_new, pFv)
+GO(gtk_icon_set_new_from_pixbuf, pFp)
+GO(gtk_icon_set_ref, pFp)
+GO(gtk_icon_set_render_icon, pFppipipp)
+GO(gtk_icon_set_unref, vFp)
+GO(gtk_icon_size_from_name, iFp)
+GO(gtk_icon_size_get_name, pFi)
+GO(gtk_icon_size_get_type, iFv)
+GO(gtk_icon_size_lookup, iFipp)
+GO(gtk_icon_size_lookup_for_settings, iFpipp)
+GO(gtk_icon_size_register, iFpii)
+GO(gtk_icon_size_register_alias, vFpi)
+GO(gtk_icon_source_copy, pFp)
+GO(gtk_icon_source_free, vFp)
+GO(gtk_icon_source_get_direction, iFp)
+GO(gtk_icon_source_get_direction_wildcarded, iFp)
+GO(gtk_icon_source_get_filename, pFp)
+GO(gtk_icon_source_get_icon_name, pFp)
+GO(gtk_icon_source_get_pixbuf, pFp)
+GO(gtk_icon_source_get_size, iFp)
+GO(gtk_icon_source_get_size_wildcarded, iFp)
+GO(gtk_icon_source_get_state, iFp)
+GO(gtk_icon_source_get_state_wildcarded, iFp)
+GO(gtk_icon_source_get_type, iFv)
+GO(gtk_icon_source_new, pFv)
+GO(gtk_icon_source_set_direction, vFpi)
+GO(gtk_icon_source_set_direction_wildcarded, vFpi)
+GO(gtk_icon_source_set_filename, vFpp)
+GO(gtk_icon_source_set_icon_name, vFpp)
+GO(gtk_icon_source_set_pixbuf, vFpp)
+GO(gtk_icon_source_set_size, vFpi)
+GO(gtk_icon_source_set_size_wildcarded, vFpi)
+GO(gtk_icon_source_set_state, vFpi)
+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, iFv)
+//GO(gtk_icon_theme_error_quark, 
+GO(gtk_icon_theme_get_default, pFv)
+GO(gtk_icon_theme_get_example_icon_name, 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, iFv)
+GO(gtk_icon_theme_has_icon, iFpp)
+GO(gtk_icon_theme_list_contexts, pFp)
+GO(gtk_icon_theme_list_icons, pFpp)
+GO(gtk_icon_theme_load_icon, pFppiup)
+GO(gtk_icon_theme_lookup_by_gicon, pFppiu)
+GO(gtk_icon_theme_lookup_icon, pFppiu)
+GO(gtk_icon_theme_new, pFv)
+//GO(gtk_icon_theme_prepend_search_path, 
+GO(gtk_icon_theme_rescan_if_needed, iFp)
+GO(gtk_icon_theme_set_custom_theme, vFpp)
+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, iFv)
+GO(gtk_icon_view_enable_model_drag_dest, vFppii)
+GO(gtk_icon_view_enable_model_drag_source, vFpipii)
+GO(gtk_icon_view_get_columns, iFp)
+GO(gtk_icon_view_get_column_spacing, iFp)
+GO(gtk_icon_view_get_cursor, iFppp)
+GO(gtk_icon_view_get_dest_item_at_pos, iFpiipp)
+GO(gtk_icon_view_get_drag_dest_item, vFppp)
+GO(gtk_icon_view_get_item_at_pos, iFpiipp)
+GO(gtk_icon_view_get_item_column, iFpp)
+GO(gtk_icon_view_get_item_orientation, iFp)
+GO(gtk_icon_view_get_item_padding, iFp)
+GO(gtk_icon_view_get_item_row, iFpp)
+GO(gtk_icon_view_get_item_width, iFp)
+GO(gtk_icon_view_get_margin, iFp)
+GO(gtk_icon_view_get_markup_column, iFp)
+GO(gtk_icon_view_get_model, pFp)
+GO(gtk_icon_view_get_orientation, iFp)
+GO(gtk_icon_view_get_path_at_pos, pFpii)
+GO(gtk_icon_view_get_pixbuf_column, iFp)
+GO(gtk_icon_view_get_reorderable, iFp)
+GO(gtk_icon_view_get_row_spacing, iFp)
+GO(gtk_icon_view_get_selected_items, pFp)
+GO(gtk_icon_view_get_selection_mode, iFp)
+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, iFv)
+GO(gtk_icon_view_get_visible_range, iFppp)
+GO(gtk_icon_view_item_activated, vFpp)
+GO(gtk_icon_view_new, pFv)
+GO(gtk_icon_view_new_with_model, pFp)
+GO(gtk_icon_view_path_is_selected, iFpp)
+GO(gtk_icon_view_scroll_to_path, vFppiff)
+GO(gtk_icon_view_select_all, vFp)
+//GOM(gtk_icon_view_selected_foreach, vFpBp)
+GO(gtk_icon_view_select_path, vFpp)
+GO(gtk_icon_view_set_columns, vFpi)
+GO(gtk_icon_view_set_column_spacing, vFpi)
+GO(gtk_icon_view_set_cursor, vFpppi)
+GO(gtk_icon_view_set_drag_dest_item, vFppi)
+GO(gtk_icon_view_set_item_orientation, vFpi)
+GO(gtk_icon_view_set_item_padding, vFpi)
+GO(gtk_icon_view_set_item_width, vFpi)
+GO(gtk_icon_view_set_margin, vFpi)
+GO(gtk_icon_view_set_markup_column, vFpi)
+GO(gtk_icon_view_set_model, vFpp)
+GO(gtk_icon_view_set_orientation, vFpi)
+GO(gtk_icon_view_set_pixbuf_column, vFpi)
+GO(gtk_icon_view_set_reorderable, vFpi)
+GO(gtk_icon_view_set_row_spacing, vFpi)
+GO(gtk_icon_view_set_selection_mode, vFpi)
+GO(gtk_icon_view_set_spacing, vFpi)
+GO(gtk_icon_view_set_text_column, vFpi)
+GO(gtk_icon_view_set_tooltip_cell, vFpppp)
+GO(gtk_icon_view_set_tooltip_column, vFpi)
+GO(gtk_icon_view_set_tooltip_item, vFppp)
+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, iFv)
+//GOM(gtk_idle_add, uFEBp)
+//GOM(gtk_idle_add_full, uFEiBppB)
+//GOM(gtk_idle_add_priority, uFEiBp)
+GO(gtk_idle_remove, vFu)
+GO(gtk_idle_remove_by_data, vFp)
+GO(gtk_image_clear, vFp)
+GO(gtk_image_get, vFppp)
+GO(gtk_image_get_animation, pFp)
+GO(gtk_image_get_gicon, vFppp)
+GO(gtk_image_get_icon_name, vFppp)
+GO(gtk_image_get_icon_set, vFppp)
+GO(gtk_image_get_image, vFppp)
+GO(gtk_image_get_pixbuf, pFp)
+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, iFp)
+GO(gtk_image_get_type, iFv)
+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, iFv)
+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)
+GO(gtk_image_menu_item_new_with_label, pFp)
+GO(gtk_image_menu_item_new_with_mnemonic, pFp)
+GO(gtk_image_menu_item_set_accel_group, vFpp)
+GO(gtk_image_menu_item_set_always_show_image, vFpi)
+GO(gtk_image_menu_item_set_image, vFpp)
+GO(gtk_image_menu_item_set_use_stock, vFpi)
+GO(gtk_image_new, pFv)
+GO(gtk_image_new_from_animation, pFp)
+GO(gtk_image_new_from_file, pFp)
+GO(gtk_image_new_from_gicon, pFpi)
+GO(gtk_image_new_from_icon_name, pFpi)
+GO(gtk_image_new_from_icon_set, pFpi)
+GO(gtk_image_new_from_image, pFpp)
+GO(gtk_image_new_from_pixbuf, pFp)
+GO(gtk_image_new_from_pixmap, pFpp)
+GO(gtk_image_new_from_stock, pFpi)
+GO(gtk_image_set, vFppp)
+GO(gtk_image_set_from_animation, vFpp)
+GO(gtk_image_set_from_file, vFppp)
+GO(gtk_image_set_from_gicon, vFppi)
+GO(gtk_image_set_from_icon_name, vFppi)
+GO(gtk_image_set_from_icon_set, vFppi)
+GO(gtk_image_set_from_image, vFppp)
+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, iFv)
+GO(gtk_im_context_delete_surrounding, iFpii)
+GO(gtk_im_context_filter_keypress, iFpp)
+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, iFv)
+GO(gtk_im_context_reset, vFp)
+GO(gtk_im_context_set_client_window, vFpp)
+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, iFv)
+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, iFv)
+GO(gtk_im_multicontext_new, pFv)
+GO(gtk_im_multicontext_set_context_id, vFpp)
+GO(gtk_im_preedit_style_get_type, iFv)
+GO(gtk_im_status_style_get_type, iFv)
+//GO(gtk_info_bar_add_action_widget, 
+//GO(gtk_info_bar_add_button, 
+//GO(gtk_info_bar_add_buttons, 
+//GO(gtk_info_bar_get_action_area, 
+//GO(gtk_info_bar_get_content_area, 
+//GO(gtk_info_bar_get_message_type, 
+GO(gtk_info_bar_get_type, iFv)
+//GO(gtk_info_bar_new, 
+//GO(gtk_info_bar_new_with_buttons, 
+//GO(gtk_info_bar_response, 
+//GO(gtk_info_bar_set_default_response, 
+//GO(gtk_info_bar_set_message_type, 
+//GO(gtk_info_bar_set_response_sensitive, 
+GOM(gtk_init, vFEpp)
+//GO(gtk_init_add, 
+GOM(gtk_init_check, iFEpp)
+GOM(gtk_init_with_args, iFEpppppp)
+//GOM(gtk_input_add_full, uFEiBBppB)
+GO(gtk_input_dialog_get_type, iFv)
+GO(gtk_input_dialog_new, pFv)
+GO(gtk_input_remove, vFu)
+//GO(gtk_invisible_get_screen, 
+GO(gtk_invisible_get_type, iFv)
+//GO(gtk_invisible_new, 
+//GO(gtk_invisible_new_for_screen, 
+//GO(gtk_invisible_set_screen, 
+//GO(gtk_item_deselect, 
+//GO(gtk_item_factories_path_delete, 
+//GO(gtk_item_factory_add_foreign, 
+//GO(gtk_item_factory_construct, 
+//GO(gtk_item_factory_create_item, 
+//GO(gtk_item_factory_create_items, 
+//GO(gtk_item_factory_create_items_ac, 
+//GO(gtk_item_factory_create_menu_entries, 
+//GO(gtk_item_factory_delete_entries, 
+//GO(gtk_item_factory_delete_entry, 
+//GO(gtk_item_factory_delete_item, 
+//GO(gtk_item_factory_from_path, 
+//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, iFv)
+//GO(gtk_item_factory_get_widget, 
+//GO(gtk_item_factory_get_widget_by_action, 
+//GO(gtk_item_factory_new, 
+//GO(gtk_item_factory_path_from_widget, 
+//GO(gtk_item_factory_popup, 
+//GO(gtk_item_factory_popup_data, 
+//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, iFv)
+//GO(gtk_item_select, 
+//GO(gtk_item_toggle, 
+GO(gtk_justification_get_type, iFv)
+//GOM(gtk_key_snooper_install, uFEBp)
+GO(gtk_key_snooper_remove, vFu)
+GO(gtk_label_get, vFpp)
+GO(gtk_label_get_angle, dFp)
+GO(gtk_label_get_attributes, pFp)
+GO(gtk_label_get_current_uri, pFp)
+GO(gtk_label_get_ellipsize, iFp)
+GO(gtk_label_get_justify, iFp)
+GO(gtk_label_get_label, pFp)
+GO(gtk_label_get_layout, pFp)
+GO(gtk_label_get_layout_offsets, vFppp)
+GO(gtk_label_get_line_wrap, iFp)
+GO(gtk_label_get_line_wrap_mode, iFp)
+GO(gtk_label_get_max_width_chars, iFp)
+GO(gtk_label_get_mnemonic_keyval, uFp)
+GO(gtk_label_get_mnemonic_widget, pFp)
+GO(gtk_label_get_selectable, iFp)
+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, iFv)
+GO(gtk_label_get_use_markup, iFp)
+GO(gtk_label_get_use_underline, iFp)
+GO(gtk_label_get_width_chars, iFp)
+GO(gtk_label_new, pFp)
+GO(gtk_label_new_with_mnemonic, pFp)
+GO(gtk_label_parse_uline, uFpp)
+GO(gtk_label_select_region, vFpii)
+GO(gtk_label_set_angle, vFpd)
+GO(gtk_label_set_attributes, vFpp)
+GO(gtk_label_set_ellipsize, vFpi)
+GO(gtk_label_set_justify, vFpi)
+GO(gtk_label_set_label, vFpp)
+GO(gtk_label_set_line_wrap, vFpi)
+GO(gtk_label_set_line_wrap_mode, vFpi)
+GO(gtk_label_set_markup, vFpp)
+GO(gtk_label_set_markup_with_mnemonic, vFpp)
+GO(gtk_label_set_max_width_chars, vFpi)
+GO(gtk_label_set_mnemonic_widget, vFpp)
+GO(gtk_label_set_pattern, vFpp)
+GO(gtk_label_set_selectable, vFpi)
+GO(gtk_label_set_single_line_mode, vFpi)
+GO(gtk_label_set_text, vFpp)
+GO(gtk_label_set_text_with_mnemonic, vFpp)
+GO(gtk_label_set_track_visited_links, vFpi)
+GO(gtk_label_set_use_markup, vFpi)
+GO(gtk_label_set_use_underline, vFpi)
+GO(gtk_label_set_width_chars, vFpi)
+//GO(gtk_layout_freeze, 
+//GO(gtk_layout_get_bin_window, 
+//GO(gtk_layout_get_hadjustment, 
+//GO(gtk_layout_get_size, 
+GO(gtk_layout_get_type, iFv)
+//GO(gtk_layout_get_vadjustment, 
+//GO(gtk_layout_move, 
+GO(gtk_layout_new, pFpp)
+//GO(gtk_layout_put, 
+//GO(gtk_layout_set_hadjustment, 
+//GO(gtk_layout_set_size, 
+//GO(gtk_layout_set_vadjustment, 
+//GO(gtk_layout_thaw, 
+GO(gtk_link_button_get_type, iFv)
+//GO(gtk_link_button_get_uri, 
+//GO(gtk_link_button_get_visited, 
+//GO(gtk_link_button_new, 
+//GO(gtk_link_button_new_with_label, 
+//GO(gtk_link_button_set_uri, 
+//GO(gtk_link_button_set_uri_hook, 
+//GO(gtk_link_button_set_visited, 
+GO(gtk_list_append_items, vFpp)
+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, iFv)
+GO(gtk_list_insert_items, vFppi)
+GO(gtk_list_item_deselect, vFp)
+GO(gtk_list_item_get_type, iFv)
+GO(gtk_list_item_new, pFv)
+GO(gtk_list_item_new_with_label, pFp)
+GO(gtk_list_item_select, vFp)
+GO(gtk_list_new, pFv)
+GO(gtk_list_prepend_items, vFpp)
+GO(gtk_list_remove_items, vFpp)
+GO(gtk_list_remove_items_no_unref, vFpp)
+GO(gtk_list_scroll_horizontal, vFpif)
+GO(gtk_list_scroll_vertical, vFpif)
+GO(gtk_list_select_all, vFp)
+GO(gtk_list_select_child, vFpp)
+GO(gtk_list_select_item, vFpi)
+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, iFv)
+GO(gtk_list_store_insert, vFppi)
+GO(gtk_list_store_insert_after, vFppp)
+GO(gtk_list_store_insert_before, vFppp)
+//GOM(gtk_list_store_insert_with_values, vFppiV)    // wrap with gtk_list_store_insert_with_valuesv
+GO(gtk_list_store_insert_with_valuesv, vFppippi)
+GO(gtk_list_store_iter_is_valid, iFpp)
+GO(gtk_list_store_move_after, vFppp)
+GO(gtk_list_store_move_before, vFppp)
+GO2(gtk_list_store_new, pFiV, gtk_list_store_newv)
+GO(gtk_list_store_newv, pFip)
+GO(gtk_list_store_prepend, vFpp)
+GO(gtk_list_store_remove, iFpp)
+GO(gtk_list_store_reorder, vFpp)
+//GO2(gtk_list_store_set, vFppV, gtk_list_store_set_valist)
+GO(gtk_list_store_set_column_types, vFpip)
+//GO(gtk_list_store_set_valist, vFppA)
+GO(gtk_list_store_set_value, vFppip)
+GO(gtk_list_store_set_valuesv, vFppppi)
+GO(gtk_list_store_swap, vFppp)
+GO(gtk_list_toggle_add_mode, vFp)
+GO(gtk_list_toggle_focus_row, vFp)
+GO(gtk_list_toggle_row, vFpp)
+GO(gtk_list_undo_selection, vFp)
+GO(gtk_list_unselect_all, vFp)
+GO(gtk_list_unselect_child, vFpp)
+GO(gtk_list_unselect_item, vFpi)
+GO(gtk_main, vFv)
+GO(gtk_main_do_event, vFp)
+GO(gtk_main_iteration, iFv)
+GO(gtk_main_iteration_do, iFi)
+GO(gtk_main_level, uFv)
+GO(gtk_main_quit, vFv)
+//GO(gtk_marshal_BOOLEAN__POINTER, 
+//GO(gtk_marshal_BOOLEAN__POINTER_INT_INT, 
+//GO(gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT, 
+//GO(gtk_marshal_BOOLEAN__POINTER_POINTER_INT_INT, 
+//GO(gtk_marshal_BOOLEAN__POINTER_STRING_STRING_POINTER, 
+//GO(gtk_marshal_BOOLEAN__VOID, 
+//GO(gtk_marshal_ENUM__ENUM, 
+//GO(gtk_marshal_INT__POINTER, 
+//GO(gtk_marshal_INT__POINTER_CHAR_CHAR, 
+//GO(gtk_marshal_VOID__ENUM_FLOAT, 
+//GO(gtk_marshal_VOID__ENUM_FLOAT_BOOLEAN, 
+//GO(gtk_marshal_VOID__INT_INT, 
+//GO(gtk_marshal_VOID__INT_INT_POINTER, 
+//GO(gtk_marshal_VOID__POINTER_INT, 
+//GO(gtk_marshal_VOID__POINTER_INT_INT_POINTER_UINT_UINT, 
+//GO(gtk_marshal_VOID__POINTER_POINTER, 
+//GO(gtk_marshal_VOID__POINTER_POINTER_POINTER, 
+//GO(gtk_marshal_VOID__POINTER_POINTER_UINT_UINT, 
+//GO(gtk_marshal_VOID__POINTER_STRING_STRING, 
+//GO(gtk_marshal_VOID__POINTER_UINT, 
+//GO(gtk_marshal_VOID__POINTER_UINT_ENUM, 
+//GO(gtk_marshal_VOID__POINTER_UINT_UINT, 
+//GO(gtk_marshal_VOID__STRING_INT_POINTER, 
+//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, iFv)
+GO(gtk_menu_attach, vFppuuuu)
+GOM(gtk_menu_attach_to_widget, vFEppp)
+GO(gtk_menu_bar_get_child_pack_direction, iFp)
+GO(gtk_menu_bar_get_pack_direction, iFp)
+GO(gtk_menu_bar_get_type, iFv)
+GO(gtk_menu_bar_new, pFv)
+GO(gtk_menu_bar_set_child_pack_direction, vFpi)
+GO(gtk_menu_bar_set_pack_direction, vFpi)
+GO(gtk_menu_detach, vFp)
+GO(gtk_menu_direction_type_get_type, iFv)
+GO(gtk_menu_get_accel_group, pFp)
+GO(gtk_menu_get_accel_path, pFp)
+GO(gtk_menu_get_active, pFp)
+GO(gtk_menu_get_attach_widget, pFp)
+GO(gtk_menu_get_for_attach_widget, pFp)
+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, iFv)
+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, iFv)
+GO(gtk_menu_item_get_use_underline, vFpi)
+GO(gtk_menu_item_new, pFv)
+GO(gtk_menu_item_new_with_label, pFp)
+GO(gtk_menu_item_new_with_mnemonic, pFp)
+GO(gtk_menu_item_remove_submenu, pFp)
+GO(gtk_menu_item_select, vFp)
+GO(gtk_menu_item_set_accel_path, vFpp)
+GO(gtk_menu_item_set_label, vFpp)
+GO(gtk_menu_item_set_right_justified, vFpi)
+GO(gtk_menu_item_set_submenu, vFpp)
+GO(gtk_menu_item_set_use_underline, vFpi)
+GO(gtk_menu_item_toggle_size_allocate, vFpi)
+GO(gtk_menu_item_toggle_size_request, vFpp)
+GO(gtk_menu_new, pFv)
+GO(gtk_menu_popdown, vFp)
+GOM(gtk_menu_popup, vFEpppppuu)
+GO(gtk_menu_reorder_child, vFppi)
+GO(gtk_menu_reposition, vFp)
+GO(gtk_menu_set_accel_group, vFpp)
+GO(gtk_menu_set_accel_path, vFpp)
+GO(gtk_menu_set_active, vFpu)
+GO(gtk_menu_set_monitor, vFpi)
+GO(gtk_menu_set_reserve_toggle_size, vFpi)
+GO(gtk_menu_set_screen, vFpp)
+GO(gtk_menu_set_tearoff_state, vFpi)
+GO(gtk_menu_set_title, vFpp)
+//GO(gtk_menu_shell_activate_item, 
+GO(gtk_menu_shell_append, vFpp)
+//GO(gtk_menu_shell_cancel, 
+//GO(gtk_menu_shell_deactivate, 
+//GO(gtk_menu_shell_deselect, 
+//GO(gtk_menu_shell_get_take_focus, 
+GO(gtk_menu_shell_get_type, iFv)
+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, 
+//GO(gtk_menu_tool_button_get_menu, 
+GO(gtk_menu_tool_button_get_type, iFv)
+//GO(gtk_menu_tool_button_new, 
+//GO(gtk_menu_tool_button_new_from_stock, 
+//GO(gtk_menu_tool_button_set_arrow_tooltip, 
+//GO(gtk_menu_tool_button_set_arrow_tooltip_markup, 
+//GO(gtk_menu_tool_button_set_arrow_tooltip_text, 
+//GO(gtk_menu_tool_button_set_menu, 
+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, iFv)
+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, iFv)
+GO(gtk_metric_type_get_type, iFv)
+GO(gtk_misc_get_alignment, vFppp)
+GO(gtk_misc_get_padding, vFppp)
+GO(gtk_misc_get_type, iFv)
+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, iFv)
+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, iFv)
+GO(gtk_notebook_append_page, iFppp)
+GO(gtk_notebook_append_page_menu, iFpppp)
+GO(gtk_notebook_get_action_widget, pFpi)
+GO(gtk_notebook_get_current_page, iFp)
+GO(gtk_notebook_get_group, pFp)
+GO(gtk_notebook_get_group_id, iFp)
+GO(gtk_notebook_get_group_name, pFp)
+GO(gtk_notebook_get_menu_label, pFpp)
+GO(gtk_notebook_get_menu_label_text, pFpp)
+GO(gtk_notebook_get_n_pages, iFp)
+GO(gtk_notebook_get_nth_page, pFpi)
+GO(gtk_notebook_get_scrollable, iFp)
+GO(gtk_notebook_get_show_border, iFp)
+GO(gtk_notebook_get_show_tabs, iFp)
+GO(gtk_notebook_get_tab_detachable, iFpp)
+GO(gtk_notebook_get_tab_hborder, WFp)
+GO(gtk_notebook_get_tab_label, pFpp)
+GO(gtk_notebook_get_tab_label_text, pFpp)
+GO(gtk_notebook_get_tab_pos, iFp)
+GO(gtk_notebook_get_tab_reorderable, iFpp)
+GO(gtk_notebook_get_tab_vborder, WFp)
+GO(gtk_notebook_get_type, iFv)
+GO(gtk_notebook_insert_page, iFpppi)
+GO(gtk_notebook_insert_page_menu, iFppppi)
+GO(gtk_notebook_new, pFv)
+GO(gtk_notebook_next_page, vFp)
+GO(gtk_notebook_page_num, iFpp)
+GO(gtk_notebook_popup_disable, vFp)
+GO(gtk_notebook_popup_enable, vFp)
+GO(gtk_notebook_prepend_page, iFppp)
+GO(gtk_notebook_prepend_page_menu, iFpppp)
+GO(gtk_notebook_prev_page, vFp)
+GO(gtk_notebook_query_tab_label_packing, vFppppp)
+GO(gtk_notebook_remove_page, vFpi)
+GO(gtk_notebook_reorder_child, vFppi)
+GO(gtk_notebook_set_action_widget, vFppi)
+GO(gtk_notebook_set_current_page, vFpi)
+GO(gtk_notebook_set_group, vFpp)
+GO(gtk_notebook_set_group_id, vFpi)
+GO(gtk_notebook_set_group_name, vFpp)
+GO(gtk_notebook_set_homogeneous_tabs, vFpi)
+GO(gtk_notebook_set_menu_label, vFppp)
+GO(gtk_notebook_set_menu_label_text, vFppp)
+GO(gtk_notebook_set_scrollable, vFpi)
+GO(gtk_notebook_set_show_border, vFpi)
+GO(gtk_notebook_set_show_tabs, vFpi)
+GO(gtk_notebook_set_tab_border, vFpu)
+GO(gtk_notebook_set_tab_detachable, vFppi)
+GO(gtk_notebook_set_tab_hborder, vFpu)
+GO(gtk_notebook_set_tab_label, vFppp)
+GO(gtk_notebook_set_tab_label_packing, vFppiii)
+GO(gtk_notebook_set_tab_label_text, vFppp)
+GO(gtk_notebook_set_tab_pos, vFpi)
+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, iFv)
+GO(gtk_number_up_layout_get_type, iFv)
+GO(gtk_object_add_arg_type, vFpiuu)
+GO(gtk_object_destroy, vFp)
+GO(gtk_object_flags_get_type, iFv)
+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, iFv)
+GO(gtk_object_get_user_data, pFp)
+GO(gtk_object_new, pFppppppppppp)   //vaarg
+GO(gtk_object_ref, pFp)
+GO(gtk_object_remove_data, vFpp)
+GO(gtk_object_remove_data_by_id, vFpp)
+GO(gtk_object_remove_no_notify, vFpp)
+GO(gtk_object_remove_no_notify_by_id, vFpp)
+GO(gtk_object_set, vFppppppppppp)   //vaarg
+GO(gtk_object_set_data, vFppp)
+GO(gtk_object_set_data_by_id, vFppp)
+//GOM(gtk_object_set_data_by_id_full, vFEpppp)
+GOM(gtk_object_set_data_full, vFEpppp)
+GO(gtk_object_set_user_data, vFpp)
+GO(gtk_object_sink, vFp)
+GO(gtk_object_unref, vFp)
+//GOM(gtk_object_weakref, vFEppp)
+//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, iFv)
+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, iFv)
+GO(gtk_option_menu_get_history, iFp)
+GO(gtk_option_menu_get_menu, pFp)
+GO(gtk_option_menu_get_type, iFv)
+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, iFp)
+GO(gtk_orientable_get_type, iFv)
+GO(gtk_orientable_set_orientation, vFpi)
+GO(gtk_orientation_get_type, iFv)
+GO(gtk_pack_direction_get_type, iFv)
+GO(gtk_pack_type_get_type, iFv)
+GO(gtk_page_orientation_get_type, iFv)
+GO(gtk_page_set_get_type, iFv)
+//GO(gtk_page_setup_copy, 
+//GO(gtk_page_setup_get_bottom_margin, 
+//GO(gtk_page_setup_get_left_margin, 
+//GO(gtk_page_setup_get_orientation, 
+//GO(gtk_page_setup_get_page_height, 
+//GO(gtk_page_setup_get_page_width, 
+//GO(gtk_page_setup_get_paper_height, 
+//GO(gtk_page_setup_get_paper_size, 
+//GO(gtk_page_setup_get_paper_width, 
+//GO(gtk_page_setup_get_right_margin, 
+//GO(gtk_page_setup_get_top_margin, 
+GO(gtk_page_setup_get_type, iFv)
+//GO(gtk_page_setup_load_file, 
+//GO(gtk_page_setup_load_key_file, 
+//GO(gtk_page_setup_new, 
+//GO(gtk_page_setup_new_from_file, 
+//GO(gtk_page_setup_new_from_key_file, 
+//GO(gtk_page_setup_set_bottom_margin, 
+//GO(gtk_page_setup_set_left_margin, 
+//GO(gtk_page_setup_set_orientation, 
+//GO(gtk_page_setup_set_paper_size, 
+//GO(gtk_page_setup_set_paper_size_and_default_margins, 
+//GO(gtk_page_setup_set_right_margin, 
+//GO(gtk_page_setup_set_top_margin, 
+//GO(gtk_page_setup_to_file, 
+//GO(gtk_page_setup_to_key_file, 
+//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, iFv)
+//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, 
+GO(gtk_paint_arrow, vFppiipppiiiiii)
+GO(gtk_paint_box, vFppiipppiiii)
+GO(gtk_paint_box_gap, vFppiipppiiiiiii)
+GO(gtk_paint_check, vFppiipppiiii)
+GO(gtk_paint_diamond, vFppiipppiiii)
+GO(gtk_paint_expander, vFppipppiii)
+GO(gtk_paint_extension, vFppiipppiiiii)
+GO(gtk_paint_flat_box, vFppiipppiiii)
+GO(gtk_paint_focus, vFppipppiiii)
+GO(gtk_paint_handle, vFppiipppiiiii)
+GO(gtk_paint_hline, vFppipppiii)
+GO(gtk_paint_layout, vFppiipppiip)
+GO(gtk_paint_option, vFppiipppiiii)
+GO(gtk_paint_polygon, vFppiippppii)
+GO(gtk_paint_resize_grip, vFppipppiiiii)
+GO(gtk_paint_shadow, vFppiipppiiii)
+GO(gtk_paint_shadow_gap, vFppiipppiiiiiii)
+GO(gtk_paint_slider, vFppiipppiiiii)
+GO(gtk_paint_spinner, vFppipppuiiii)
+GO(gtk_paint_string, vFppipppiip)
+GO(gtk_paint_tab, vFppiipppiiii)
+GO(gtk_paint_vline, vFppipppiii)
+GO(gtk_paned_add1, vFpp)
+GO(gtk_paned_add2, vFpp)
+GO(gtk_paned_compute_position, vFpiii)
+GO(gtk_paned_get_child1, pFp)
+GO(gtk_paned_get_child2, pFp)
+GO(gtk_paned_get_handle_window, pFp)
+GO(gtk_paned_get_position, pFp)
+GO(gtk_paned_get_type, iFv)
+GO(gtk_paned_pack1, vFppii)
+GO(gtk_paned_pack2, vFppii)
+GO(gtk_paned_set_position, vFpi)
+GO(gtk_paper_size_copy, pFp)
+GO(gtk_paper_size_free, vFp)
+GO(gtk_paper_size_get_default, pFv)
+GO(gtk_paper_size_get_default_bottom_margin, dFpi)
+GO(gtk_paper_size_get_default_left_margin, dFpi)
+GO(gtk_paper_size_get_default_right_margin, dFpi)
+GO(gtk_paper_size_get_default_top_margin, dFpi)
+GO(gtk_paper_size_get_display_name, pFp)
+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, iFv)
+GO(gtk_paper_size_get_width, dFpi)
+GO(gtk_paper_size_is_custom, iFp)
+GO(gtk_paper_size_is_equal, iFpp)
+GO(gtk_paper_size_new, pFp)
+GO(gtk_paper_size_new_custom, pFppddi)
+GO(gtk_paper_size_new_from_key_file, pFppp)
+GO(gtk_paper_size_new_from_ppd, pFppdd)
+GO(gtk_paper_size_set_size, vFpddi)
+GO(gtk_paper_size_to_key_file, vFppp)
+GO(gtk_parse_args, iFpp)
+GO(gtk_path_bar_get_type, iFv)
+GO(gtk_path_priority_type_get_type, iFv)
+GO(gtk_path_type_get_type, iFv)
+GO(gtk_pixmap_get, vFppp)
+GO(gtk_pixmap_get_type, iFv)
+GO(gtk_pixmap_new, pFpp)
+GO(gtk_pixmap_set, vFppp)
+GO(gtk_pixmap_set_build_insensitive, vFpi)
+GO(gtk_plug_construct, vFpp)
+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, iFv)
+GO(gtk_plug_new, pFp)
+GO(gtk_plug_new_for_display, pFpp)
+GO(gtk_policy_type_get_type, iFv)
+GO(gtk_position_type_get_type, iFv)
+//GO(gtk_preview_draw_row, 
+//GO(gtk_preview_get_cmap, 
+//GO(gtk_preview_get_info, 
+GO(gtk_preview_get_type, iFv)
+//GO(gtk_preview_get_visual, 
+//GO(gtk_preview_new, 
+//GO(gtk_preview_put, 
+//GO(gtk_preview_reset, 
+//GO(gtk_preview_set_color_cube, 
+//GO(gtk_preview_set_dither, 
+//GO(gtk_preview_set_expand, 
+//GO(gtk_preview_set_gamma, 
+//GO(gtk_preview_set_install_cmap, 
+//GO(gtk_preview_set_reserved, 
+//GO(gtk_preview_size, 
+GO(gtk_preview_type_get_type, iFv)
+//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, iFv)
+//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, iFv)
+//GO(gtk_print_context_create_pango_context, 
+//GO(gtk_print_context_create_pango_layout, 
+//GO(gtk_print_context_get_cairo_context, 
+//GO(gtk_print_context_get_dpi_x, 
+//GO(gtk_print_context_get_dpi_y, 
+//GO(gtk_print_context_get_hard_margins, 
+//GO(gtk_print_context_get_height, 
+//GO(gtk_print_context_get_page_setup, 
+//GO(gtk_print_context_get_pango_fontmap, 
+GO(gtk_print_context_get_type, iFv)
+//GO(gtk_print_context_get_width, 
+//GO(gtk_print_context_set_cairo_context, 
+GO(gtk_print_duplex_get_type, iFv)
+//GO(gtk_printer_accepts_pdf, 
+//GO(gtk_printer_accepts_ps, 
+//GO(gtk_printer_compare, 
+//GO(gtk_printer_get_backend, 
+//GO(gtk_printer_get_capabilities, 
+//GO(gtk_printer_get_default_page_size, 
+//GO(gtk_printer_get_description, 
+//GO(gtk_printer_get_hard_margins, 
+//GO(gtk_printer_get_icon_name, 
+//GO(gtk_printer_get_job_count, 
+//GO(gtk_printer_get_location, 
+//GO(gtk_printer_get_name, 
+//GO(gtk_printer_get_state_message, 
+GO(gtk_printer_get_type, iFv)
+//GO(gtk_printer_has_details, 
+//GO(gtk_printer_is_accepting_jobs, 
+//GO(gtk_printer_is_active, 
+//GO(gtk_printer_is_default, 
+//GO(gtk_printer_is_new, 
+//GO(gtk_printer_is_paused, 
+//GO(gtk_printer_is_virtual, 
+//GO(gtk_printer_list_papers, 
+//GO(gtk_printer_new, 
+//GO(gtk_printer_option_allocate_choices, 
+//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, iFv)
+//GO(gtk_printer_option_has_choice, 
+//GO(gtk_printer_option_new, 
+//GO(gtk_printer_option_set, 
+//GO(gtk_printer_option_set_activates_default, 
+//GO(gtk_printer_option_set_add, 
+//GO(gtk_printer_option_set_boolean, 
+//GO(gtk_printer_option_set_clear_conflicts, 
+//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, iFv)
+//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, iFv)
+//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, iFv)
+//GO(gtk_print_error_quark, 
+//GO(gtk_printer_set_accepts_pdf, 
+//GO(gtk_printer_set_accepts_ps, 
+//GO(gtk_printer_set_description, 
+//GO(gtk_printer_set_has_details, 
+//GO(gtk_printer_set_icon_name, 
+//GO(gtk_printer_set_is_accepting_jobs, 
+//GO(gtk_printer_set_is_active, 
+//GO(gtk_printer_set_is_default, 
+//GO(gtk_printer_set_is_new, 
+//GO(gtk_printer_set_is_paused, 
+//GO(gtk_printer_set_job_count, 
+//GO(gtk_printer_set_location, 
+//GO(gtk_printer_set_state_message, 
+//GO(gtk_print_job_get_printer, 
+//GO(gtk_print_job_get_settings, 
+//GO(gtk_print_job_get_status, 
+//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, iFv)
+//GO(gtk_print_job_new, 
+//GO(gtk_print_job_send, 
+//GO(gtk_print_job_set_source_file, 
+//GO(gtk_print_job_set_status, 
+//GO(gtk_print_job_set_track_print_status, 
+GO(gtk_print_operation_action_get_type, iFv)
+//GO(gtk_print_operation_cancel, 
+//GO(gtk_print_operation_draw_page_finish, 
+//GO(gtk_print_operation_get_default_page_setup, 
+//GO(gtk_print_operation_get_embed_page_setup, 
+//GO(gtk_print_operation_get_error, 
+//GO(gtk_print_operation_get_has_selection, 
+//GO(gtk_print_operation_get_n_pages_to_print, 
+//GO(gtk_print_operation_get_print_settings, 
+//GO(gtk_print_operation_get_status, 
+//GO(gtk_print_operation_get_status_string, 
+//GO(gtk_print_operation_get_support_selection, 
+GO(gtk_print_operation_get_type, iFv)
+//GO(gtk_print_operation_is_finished, 
+//GO(gtk_print_operation_new, 
+//GO(gtk_print_operation_preview_end_preview, 
+GO(gtk_print_operation_preview_get_type, iFv)
+//GO(gtk_print_operation_preview_is_selected, 
+//GO(gtk_print_operation_preview_render_page, 
+GO(gtk_print_operation_result_get_type, iFv)
+//GO(gtk_print_operation_run, 
+//GO(gtk_print_operation_set_allow_async, 
+//GO(gtk_print_operation_set_current_page, 
+//GO(gtk_print_operation_set_custom_tab_label, 
+//GO(gtk_print_operation_set_default_page_setup, 
+//GO(gtk_print_operation_set_defer_drawing, 
+//GO(gtk_print_operation_set_embed_page_setup, 
+//GO(gtk_print_operation_set_export_filename, 
+//GO(gtk_print_operation_set_has_selection, 
+//GO(gtk_print_operation_set_job_name, 
+//GO(gtk_print_operation_set_n_pages, 
+//GO(gtk_print_operation_set_print_settings, 
+//GO(gtk_print_operation_set_show_progress, 
+//GO(gtk_print_operation_set_support_selection, 
+//GO(gtk_print_operation_set_track_print_status, 
+//GO(gtk_print_operation_set_unit, 
+//GO(gtk_print_operation_set_use_full_page, 
+GO(gtk_print_pages_get_type, iFv)
+GO(gtk_print_quality_get_type, iFv)
+//GO(gtk_print_run_page_setup_dialog, 
+//GO(gtk_print_run_page_setup_dialog_async, 
+//GO(gtk_print_settings_copy, 
+//GO(gtk_print_settings_foreach, 
+//GO(gtk_print_settings_get, 
+//GO(gtk_print_settings_get_bool, 
+//GO(gtk_print_settings_get_collate, 
+//GO(gtk_print_settings_get_default_source, 
+//GO(gtk_print_settings_get_dither, 
+//GO(gtk_print_settings_get_double, 
+//GO(gtk_print_settings_get_double_with_default, 
+//GO(gtk_print_settings_get_duplex, 
+//GO(gtk_print_settings_get_finishings, 
+//GO(gtk_print_settings_get_int, 
+//GO(gtk_print_settings_get_int_with_default, 
+//GO(gtk_print_settings_get_length, 
+//GO(gtk_print_settings_get_media_type, 
+//GO(gtk_print_settings_get_n_copies, 
+//GO(gtk_print_settings_get_number_up, 
+//GO(gtk_print_settings_get_number_up_layout, 
+//GO(gtk_print_settings_get_orientation, 
+//GO(gtk_print_settings_get_output_bin, 
+//GO(gtk_print_settings_get_page_ranges, 
+//GO(gtk_print_settings_get_page_set, 
+//GO(gtk_print_settings_get_paper_height, 
+//GO(gtk_print_settings_get_paper_size, 
+//GO(gtk_print_settings_get_paper_width, 
+//GO(gtk_print_settings_get_printer, 
+//GO(gtk_print_settings_get_printer_lpi, 
+//GO(gtk_print_settings_get_print_pages, 
+//GO(gtk_print_settings_get_quality, 
+//GO(gtk_print_settings_get_resolution, 
+//GO(gtk_print_settings_get_resolution_x, 
+//GO(gtk_print_settings_get_resolution_y, 
+//GO(gtk_print_settings_get_reverse, 
+//GO(gtk_print_settings_get_scale, 
+GO(gtk_print_settings_get_type, iFv)
+//GO(gtk_print_settings_get_use_color, 
+//GO(gtk_print_settings_has_key, 
+//GO(gtk_print_settings_load_file, 
+//GO(gtk_print_settings_load_key_file, 
+//GO(gtk_print_settings_new, 
+//GO(gtk_print_settings_new_from_file, 
+//GO(gtk_print_settings_new_from_key_file, 
+//GO(gtk_print_settings_set, 
+//GO(gtk_print_settings_set_bool, 
+//GO(gtk_print_settings_set_collate, 
+//GO(gtk_print_settings_set_default_source, 
+//GO(gtk_print_settings_set_dither, 
+//GO(gtk_print_settings_set_double, 
+//GO(gtk_print_settings_set_duplex, 
+//GO(gtk_print_settings_set_finishings, 
+//GO(gtk_print_settings_set_int, 
+//GO(gtk_print_settings_set_length, 
+//GO(gtk_print_settings_set_media_type, 
+//GO(gtk_print_settings_set_n_copies, 
+//GO(gtk_print_settings_set_number_up, 
+//GO(gtk_print_settings_set_number_up_layout, 
+//GO(gtk_print_settings_set_orientation, 
+//GO(gtk_print_settings_set_output_bin, 
+//GO(gtk_print_settings_set_page_ranges, 
+//GO(gtk_print_settings_set_page_set, 
+//GO(gtk_print_settings_set_paper_height, 
+//GO(gtk_print_settings_set_paper_size, 
+//GO(gtk_print_settings_set_paper_width, 
+//GO(gtk_print_settings_set_printer, 
+//GO(gtk_print_settings_set_printer_lpi, 
+//GO(gtk_print_settings_set_print_pages, 
+//GO(gtk_print_settings_set_quality, 
+//GO(gtk_print_settings_set_resolution, 
+//GO(gtk_print_settings_set_resolution_xy, 
+//GO(gtk_print_settings_set_reverse, 
+//GO(gtk_print_settings_set_scale, 
+//GO(gtk_print_settings_set_use_color, 
+//GO(gtk_print_settings_to_file, 
+//GO(gtk_print_settings_to_key_file, 
+//GO(gtk_print_settings_unset, 
+GO(gtk_print_status_get_type, iFv)
+//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, 
+//GO(gtk_print_unix_dialog_get_has_selection, 
+//GO(gtk_print_unix_dialog_get_manual_capabilities, 
+//GO(gtk_print_unix_dialog_get_page_setup, 
+//GO(gtk_print_unix_dialog_get_page_setup_set, 
+//GO(gtk_print_unix_dialog_get_selected_printer, 
+//GO(gtk_print_unix_dialog_get_settings, 
+//GO(gtk_print_unix_dialog_get_support_selection, 
+GO(gtk_print_unix_dialog_get_type, iFv)
+//GO(gtk_print_unix_dialog_new, 
+//GO(gtk_print_unix_dialog_set_current_page, 
+//GO(gtk_print_unix_dialog_set_embed_page_setup, 
+//GO(gtk_print_unix_dialog_set_has_selection, 
+//GO(gtk_print_unix_dialog_set_manual_capabilities, 
+//GO(gtk_print_unix_dialog_set_page_setup, 
+//GO(gtk_print_unix_dialog_set_settings, 
+//GO(gtk_print_unix_dialog_set_support_selection, 
+GO(gtk_private_flags_get_type, iFv)
+GO(gtk_progress_bar_get_ellipsize, iFp)
+GO(gtk_progress_bar_get_fraction, dFp)
+GO(gtk_progress_bar_get_orientation, iFp)
+GO(gtk_progress_bar_get_pulse_step, fFp)
+GO(gtk_progress_bar_get_text, pFp)
+GO(gtk_progress_bar_get_type, iFv)
+GO(gtk_progress_bar_new, pFv)
+GO(gtk_progress_bar_new_with_adjustment, pFp)
+GO(gtk_progress_bar_orientation_get_type, iFv)
+GO(gtk_progress_bar_pulse, vFp)
+GO(gtk_progress_bar_set_activity_blocks, vFpu)
+GO(gtk_progress_bar_set_activity_step, vFpu)
+GO(gtk_progress_bar_set_bar_style, vFpi)
+GO(gtk_progress_bar_set_discrete_blocks, vFpu)
+GO(gtk_progress_bar_set_ellipsize, vFpi)
+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, iFv)
+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, iFv)
+//GO(gtk_progress_get_value, 
+//GO(gtk_progress_set_activity_mode, 
+//GO(gtk_progress_set_adjustment, 
+//GO(gtk_progress_set_format_string, 
+//GO(gtk_progress_set_percentage, 
+//GO(gtk_progress_set_show_text, 
+//GO(gtk_progress_set_text_alignment, 
+//GO(gtk_progress_set_value, 
+GO(gtk_propagate_event, vFpp)
+//GOM(gtk_quit_add, iFEuBp)
+GO(gtk_quit_add_destroy, vFup)
+//GOM(gtk_quit_add_full, uFuBppB)
+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, iFv)
+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, iFv)
+GO(gtk_radio_button_new, pFp)
+GO(gtk_radio_button_new_from_widget, pFp)
+GO(gtk_radio_button_new_with_label, pFpp)
+GO(gtk_radio_button_new_with_label_from_widget, pFpp)
+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, iFv)
+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)
+GO(gtk_radio_menu_item_new_with_label_from_widget, pFpp)
+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, iFv)
+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)
+GO(gtk_radio_tool_button_new_with_stock_from_widget, pFpp)
+GO(gtk_radio_tool_button_set_group, vFpp)
+GO(gtk_range_get_adjustment, pFp)
+GO(gtk_range_get_fill_level, dFp)
+GO(gtk_range_get_flippable, iFp)
+GO(gtk_range_get_inverted, iFp)
+GO(gtk_range_get_lower_stepper_sensitivity, iFp)
+GO(gtk_range_get_min_slider_size, iFp)
+GO(gtk_range_get_range_rect, vFpp)
+GO(gtk_range_get_restrict_to_fill_level, iFp)
+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, iFv)
+GO(gtk_range_get_update_policy, iFp)
+GO(gtk_range_get_upper_stepper_sensitivity, iFp)
+GO(gtk_range_get_value, dFp)
+GO(gtk_range_set_adjustment, vFpp)
+GO(gtk_range_set_fill_level, vFpd)
+GO(gtk_range_set_flippable, vFpi)
+GO(gtk_range_set_increments, vFpdd)
+GO(gtk_range_set_inverted, vFpi)
+GO(gtk_range_set_lower_stepper_sensitivity, vFpi)
+GO(gtk_range_set_min_slider_size, vFpi)
+GO(gtk_range_set_range, vFpdd)
+GO(gtk_range_set_restrict_to_fill_level, vFpi)
+GO(gtk_range_set_round_digits, vFpi)
+GO(gtk_range_set_show_fill_level, vFpi)
+GO(gtk_range_set_slider_size_fixed, vFpi)
+GO(gtk_range_set_update_policy, vFpi)
+GO(gtk_range_set_upper_stepper_sensitivity, vFpi)
+GO(gtk_range_set_value, vFpd)
+GO(gtk_rc_add_class_style, vFpp)
+GO(gtk_rc_add_default_file, vFp)
+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, iFv)
+GO(gtk_rc_get_default_files, pFv)
+GO(gtk_rc_get_im_module_file, pFv)
+GO(gtk_rc_get_im_module_path, pFv)
+GO(gtk_rc_get_module_dir, pFv)
+GO(gtk_rc_get_style, pFp)
+GO(gtk_rc_get_style_by_paths, pFpppi)
+GO(gtk_rc_get_theme_dir, pFv)
+GO(gtk_rc_parse, vFp)
+GO(gtk_rc_parse_color, uFpp)
+GO(gtk_rc_parse_color_full, uFppp)
+GO(gtk_rc_parse_priority, iFpp)
+GO(gtk_rc_parse_state, uFpp)
+GO(gtk_rc_parse_string, vFp)
+GO(gtk_rc_property_parse_border, iFppp)
+GO(gtk_rc_property_parse_color, iFppp)
+GO(gtk_rc_property_parse_enum, iFppp)
+GO(gtk_rc_property_parse_flags, iFppp)
+GO(gtk_rc_property_parse_requisition, iFppp)
+GO(gtk_rc_reparse_all, iFv)
+GO(gtk_rc_reparse_all_for_settings, iFpi)
+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, iFv)
+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, iFv)
+//GO(gtk_recent_action_get_show_numbers, 
+GO(gtk_recent_action_get_type, iFv)
+//GO(gtk_recent_action_new, 
+//GO(gtk_recent_action_new_for_manager, 
+//GO(gtk_recent_action_set_show_numbers, 
+//GO(gtk_recent_chooser_add_filter, 
+GO(gtk_recent_chooser_dialog_get_type, iFv)
+//GO(gtk_recent_chooser_dialog_new, 
+//GO(gtk_recent_chooser_dialog_new_for_manager, 
+GO(gtk_recent_chooser_error_get_type, iFv)
+//GO(gtk_recent_chooser_error_quark, 
+//GO(gtk_recent_chooser_get_current_item, 
+//GO(gtk_recent_chooser_get_current_uri, 
+//GO(gtk_recent_chooser_get_filter, 
+//GO(gtk_recent_chooser_get_items, 
+//GO(gtk_recent_chooser_get_limit, 
+//GO(gtk_recent_chooser_get_local_only, 
+//GO(gtk_recent_chooser_get_select_multiple, 
+//GO(gtk_recent_chooser_get_show_icons, 
+//GO(gtk_recent_chooser_get_show_not_found, 
+//GO(gtk_recent_chooser_get_show_numbers, 
+//GO(gtk_recent_chooser_get_show_private, 
+//GO(gtk_recent_chooser_get_show_tips, 
+//GO(gtk_recent_chooser_get_sort_type, 
+GO(gtk_recent_chooser_get_type, iFv)
+//GO(gtk_recent_chooser_get_uris, 
+//GO(gtk_recent_chooser_list_filters, 
+//GO(gtk_recent_chooser_menu_get_show_numbers, 
+GO(gtk_recent_chooser_menu_get_type, iFv)
+//GO(gtk_recent_chooser_menu_new, 
+//GO(gtk_recent_chooser_menu_new_for_manager, 
+//GO(gtk_recent_chooser_menu_set_show_numbers, 
+//GO(gtk_recent_chooser_remove_filter, 
+//GO(gtk_recent_chooser_select_all, 
+//GO(gtk_recent_chooser_select_uri, 
+//GO(gtk_recent_chooser_set_current_uri, 
+//GO(gtk_recent_chooser_set_filter, 
+//GO(gtk_recent_chooser_set_limit, 
+//GO(gtk_recent_chooser_set_local_only, 
+//GO(gtk_recent_chooser_set_select_multiple, 
+//GO(gtk_recent_chooser_set_show_icons, 
+//GO(gtk_recent_chooser_set_show_not_found, 
+//GO(gtk_recent_chooser_set_show_numbers, 
+//GO(gtk_recent_chooser_set_show_private, 
+//GO(gtk_recent_chooser_set_show_tips, 
+//GO(gtk_recent_chooser_set_sort_func, 
+//GO(gtk_recent_chooser_set_sort_type, 
+//GO(gtk_recent_chooser_unselect_all, 
+//GO(gtk_recent_chooser_unselect_uri, 
+GO(gtk_recent_chooser_widget_get_type, iFv)
+//GO(gtk_recent_chooser_widget_new, 
+//GO(gtk_recent_chooser_widget_new_for_manager, 
+//GO(gtk_recent_filter_add_age, 
+//GO(gtk_recent_filter_add_application, 
+//GO(gtk_recent_filter_add_custom, 
+//GO(gtk_recent_filter_add_group, 
+//GO(gtk_recent_filter_add_mime_type, 
+//GO(gtk_recent_filter_add_pattern, 
+//GO(gtk_recent_filter_add_pixbuf_formats, 
+//GO(gtk_recent_filter_filter, 
+GO(gtk_recent_filter_flags_get_type, iFv)
+//GO(gtk_recent_filter_get_name, 
+//GO(gtk_recent_filter_get_needed, 
+GO(gtk_recent_filter_get_type, iFv)
+//GO(gtk_recent_filter_new, 
+//GO(gtk_recent_filter_set_name, 
+//GO(gtk_recent_info_exists, 
+//GO(gtk_recent_info_get_added, 
+//GO(gtk_recent_info_get_age, 
+//GO(gtk_recent_info_get_application_info, 
+//GO(gtk_recent_info_get_applications, 
+//GO(gtk_recent_info_get_description, 
+//GO(gtk_recent_info_get_display_name, 
+//GO(gtk_recent_info_get_groups, 
+//GO(gtk_recent_info_get_icon, 
+//GO(gtk_recent_info_get_mime_type, 
+//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, iFv)
+//GO(gtk_recent_info_get_uri, 
+//GO(gtk_recent_info_get_uri_display, 
+//GO(gtk_recent_info_get_visited, 
+//GO(gtk_recent_info_has_application, 
+//GO(gtk_recent_info_has_group, 
+//GO(gtk_recent_info_is_local, 
+//GO(gtk_recent_info_last_application, 
+//GO(gtk_recent_info_match, 
+//GO(gtk_recent_info_ref, 
+//GO(gtk_recent_info_unref, 
+//GO(gtk_recent_manager_add_full, 
+//GO(gtk_recent_manager_add_item, 
+GO(gtk_recent_manager_error_get_type, iFv)
+//GO(gtk_recent_manager_error_quark, 
+//GO(gtk_recent_manager_get_default, 
+//GO(gtk_recent_manager_get_for_screen, 
+//GO(gtk_recent_manager_get_items, 
+//GO(gtk_recent_manager_get_limit, 
+GO(gtk_recent_manager_get_type, iFv)
+//GO(gtk_recent_manager_has_item, 
+//GO(gtk_recent_manager_lookup_item, 
+//GO(gtk_recent_manager_move_item, 
+//GO(gtk_recent_manager_new, 
+//GO(gtk_recent_manager_purge_items, 
+//GO(gtk_recent_manager_remove_item, 
+//GO(gtk_recent_manager_set_limit, 
+//GO(gtk_recent_manager_set_screen, 
+GO(gtk_recent_sort_type_get_type, iFv)
+GO(gtk_relief_style_get_type, iFv)
+GO(gtk_render_activity, vFppdddd)
+GO(gtk_render_arrow, vFppdddd)
+GO(gtk_render_background, vFppdddd)
+GO(gtk_render_background_get_clip, vFpddddp)
+GO(gtk_render_check, vFppdddd)
+GO(gtk_render_expander, vFppdddd)
+GO(gtk_render_extension, vFppddddi)
+GO(gtk_render_focus, vFppdddd)
+GO(gtk_render_frame, vFppdddd)
+GO(gtk_render_frame_gap, vFppddddidd)
+GO(gtk_render_handle, vFppdddd)
+GO(gtk_render_icon, vFpppdd)
+GO(gtk_render_icon_pixbuf, pFppi)
+GO(gtk_render_icon_surface, vFpppdd)
+GO(gtk_render_insertion_cursor, vFppddpii)
+GO(gtk_render_layout, vFppddp)
+GO(gtk_render_line, vFppdddd)
+GO(gtk_render_option, vFppdddd)
+GO(gtk_render_slider, vFppddddi)
+GO(gtk_requisition_copy, pFp)
+GO(gtk_requisition_free, vFp)
+GO(gtk_requisition_get_type, iFv)
+GO(gtk_resize_mode_get_type, iFv)
+GO(gtk_response_type_get_type, iFv)
+//GO(gtk_rgb_to_hsv, 
+//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, iFv)
+//GO(gtk_ruler_set_metric, 
+//GO(gtk_ruler_set_range, 
+//GO(gtk_scale_add_mark, 
+//GO(gtk_scale_button_get_adjustment, 
+//GO(gtk_scale_button_get_minus_button, 
+//GO(gtk_scale_button_get_orientation, 
+//GO(gtk_scale_button_get_plus_button, 
+//GO(gtk_scale_button_get_popup, 
+GO(gtk_scale_button_get_type, iFv)
+//GO(gtk_scale_button_get_value, 
+//GO(gtk_scale_button_new, 
+//GO(gtk_scale_button_set_adjustment, 
+//GO(gtk_scale_button_set_icons, 
+//GO(gtk_scale_button_set_orientation, 
+//GO(gtk_scale_button_set_value, 
+//GO(gtk_scale_clear_marks, 
+//GO(gtk_scale_get_digits, 
+//GO(gtk_scale_get_draw_value, 
+//GO(gtk_scale_get_layout, 
+//GO(gtk_scale_get_layout_offsets, 
+GO(gtk_scale_get_type, iFv)
+//GO(gtk_scale_get_value_pos, 
+//GO(gtk_scale_set_digits, 
+//GO(gtk_scale_set_draw_value, 
+//GO(gtk_scale_set_value_pos, 
+GO(gtk_scrollbar_get_type, iFv)
+//GO(gtk_scrolled_window_add_with_viewport, 
+GO(gtk_scrolled_window_get_hadjustment, pFp)
+GO(gtk_scrolled_window_get_hscrollbar, pFp)
+GO(gtk_scrolled_window_get_placement, iFp)
+GO(gtk_scrolled_window_get_policy, vFppp)
+GO(gtk_scrolled_window_get_shadow_type, iFp)
+GO(gtk_scrolled_window_get_type, iFv)
+GO(gtk_scrolled_window_get_vadjustment, pFp)
+GO(gtk_scrolled_window_get_vscrollbar, pFp)
+GO(gtk_scrolled_window_new, pFpp)
+GO(gtk_scrolled_window_set_hadjustment, vFpp)
+GO(gtk_scrolled_window_set_placement, vFpi)
+GO(gtk_scrolled_window_set_policy, vFpii)
+GO(gtk_scrolled_window_set_shadow_type, vFpi)
+GO(gtk_scrolled_window_set_vadjustment, vFpp)
+GO(gtk_scrolled_window_unset_placement, vFp)
+GO(gtk_scroll_step_get_type, iFv)
+GO(gtk_scroll_type_get_type, iFv)
+GO(gtk_selection_add_target, vFpppu)
+GO(gtk_selection_add_targets, vFpppu)
+GO(gtk_selection_clear, iFpp)
+GO(gtk_selection_clear_targets, vFpp)
+GO(gtk_selection_convert, iFpppu)
+GO(gtk_selection_data_copy, pFp)
+GO(gtk_selection_data_free, vFp)
+GO(gtk_selection_data_get_data, pFp)
+GO(gtk_selection_data_get_data_type, iFp)
+GO(gtk_selection_data_get_display, pFp)
+GO(gtk_selection_data_get_format, iFp)
+GO(gtk_selection_data_get_length, iFp)
+GO(gtk_selection_data_get_pixbuf, pFp)
+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, iFv)
+GO(gtk_selection_data_get_uris, pFp)
+GO(gtk_selection_data_set, vFppipi)
+GO(gtk_selection_data_set_pixbuf, iFpp)
+GO(gtk_selection_data_set_text, iFppi)
+GO(gtk_selection_data_set_uris, iFpp)
+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, iFv)
+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, iFv)
+GO(gtk_separator_get_type, iFv)
+GO(gtk_separator_menu_item_get_type, iFv)
+GO(gtk_separator_menu_item_new, pFv)
+GO(gtk_separator_tool_item_get_draw, iFp)
+GO(gtk_separator_tool_item_get_type, iFv)
+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, iFv)
+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, iFv)
+//GO(gtk_show_about_dialog, 
+GO(gtk_show_uri, iFppup)
+GO(gtk_side_type_get_type, iFv)
+//GO(gtk_signal_compat_matched, 
+GOM(gtk_signal_connect_full, LFEppppppii)
+//GO(gtk_signal_connect_object_while_alive, 
+//GO(gtk_signal_connect_while_alive, 
+//GO(gtk_signal_emit, 
+//GO(gtk_signal_emit_by_name, 
+//GO(gtk_signal_emit_stop_by_name, 
+//GO(gtk_signal_emitv, 
+//GO(gtk_signal_emitv_by_name, 
+//GO(gtk_signal_new, 
+//GO(gtk_signal_newv, 
+GO(gtk_signal_run_type_get_type, iFv)
+//GO(gtk_size_group_add_widget, 
+//GO(gtk_size_group_get_ignore_hidden, 
+//GO(gtk_size_group_get_mode, 
+GO(gtk_size_group_get_type, iFv)
+//GO(gtk_size_group_get_widgets, 
+GO(gtk_size_group_mode_get_type, iFv)
+//GO(gtk_size_group_new, 
+//GO(gtk_size_group_remove_widget, 
+//GO(gtk_size_group_set_ignore_hidden, 
+//GO(gtk_size_group_set_mode, 
+GO(gtk_socket_add_id, vFpp)
+GO(gtk_socket_get_id, pFp)
+GO(gtk_socket_get_plug_window, pFp)
+GO(gtk_socket_get_type, iFv)
+GO(gtk_socket_new, pFv)
+GO(gtk_socket_steal, vFpp)
+GO(gtk_sort_type_get_type, iFv)
+GO(gtk_spin_button_configure, vFppdu)
+GO(gtk_spin_button_get_adjustment, pFp)
+GO(gtk_spin_button_get_digits, uFp)
+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, iFv)
+GO(gtk_spin_button_get_update_policy, iFp)
+GO(gtk_spin_button_get_value, dFp)
+GO(gtk_spin_button_get_value_as_int, iFp)
+GO(gtk_spin_button_get_wrap, iFp)
+GO(gtk_spin_button_new, pFpdu)
+GO(gtk_spin_button_new_with_range, pFddd)
+GO(gtk_spin_button_set_adjustment, vFpp)
+GO(gtk_spin_button_set_digits, vFpu)
+GO(gtk_spin_button_set_increments, vFpdd)
+GO(gtk_spin_button_set_numeric, vFpi)
+GO(gtk_spin_button_set_range, vFpdd)
+GO(gtk_spin_button_set_snap_to_ticks, vFpi)
+GO(gtk_spin_button_set_update_policy, vFpi)
+GO(gtk_spin_button_set_value, vFpd)
+GO(gtk_spin_button_set_wrap, vFpi)
+GO(gtk_spin_button_spin, vFpid)
+GO(gtk_spin_button_update, vFp)
+GO(gtk_spin_button_update_policy_get_type, iFv)
+GO(gtk_spinner_get_type, iFv)
+GO(gtk_spinner_new, pFv)
+GO(gtk_spinner_start, vFp)
+GO(gtk_spinner_stop, vFp)
+GO(gtk_spin_type_get_type, iFv)
+GO(gtk_state_type_get_type, iFv)
+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, iFv)
+GO(gtk_statusbar_new, pFv)
+GO(gtk_statusbar_pop, vFpu)
+GO(gtk_statusbar_push, uFpup)
+GO(gtk_statusbar_remove, vFpuu)
+GO(gtk_statusbar_remove_all, vFpu)
+GO(gtk_statusbar_set_has_resize_grip, vFpi)
+GO(gtk_status_icon_get_blinking, iFp)
+GO(gtk_status_icon_get_geometry, iFpppp)
+GO(gtk_status_icon_get_gicon, pFp)
+GO(gtk_status_icon_get_has_tooltip, iFp)
+GO(gtk_status_icon_get_icon_name, pFp)
+GO(gtk_status_icon_get_pixbuf, pFp)
+GO(gtk_status_icon_get_screen, pFp)
+GO(gtk_status_icon_get_size, iFp)
+GO(gtk_status_icon_get_stock, pFp)
+GO(gtk_status_icon_get_storage_type, iFp)
+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, iFv)
+GO(gtk_status_icon_get_visible, iFp)
+GO(gtk_status_icon_get_x11_window_id, uFp)
+GO(gtk_status_icon_is_embedded, iFp)
+GO(gtk_status_icon_new, pFv)
+GO(gtk_status_icon_new_from_file, pFp)
+GO(gtk_status_icon_new_from_gicon, pFp)
+GO(gtk_status_icon_new_from_icon_name, pFp)
+GO(gtk_status_icon_new_from_pixbuf, pFp)
+GO(gtk_status_icon_new_from_stock, pFp)
+GO(gtk_status_icon_position_menu, vFppppp)
+GO(gtk_status_icon_set_blinking, vFpi)
+GO(gtk_status_icon_set_from_file, vFpp)
+GO(gtk_status_icon_set_from_gicon, vFpp)
+GO(gtk_status_icon_set_from_icon_name, vFpp)
+GO(gtk_status_icon_set_from_pixbuf, vFpp)
+GO(gtk_status_icon_set_from_stock, vFpp)
+GO(gtk_status_icon_set_has_tooltip, vFpi)
+GO(gtk_status_icon_set_name, vFpp)
+GO(gtk_status_icon_set_screen, vFpp)
+GO(gtk_status_icon_set_title, vFpp)
+GO(gtk_status_icon_set_tooltip, vFpp)
+GO(gtk_status_icon_set_tooltip_markup, vFpp)
+GO(gtk_status_icon_set_tooltip_text, vFpp)
+GO(gtk_status_icon_set_visible, vFpi)
+GO(gtk_stock_add, vFpu)
+GO(gtk_stock_add_static, vFpu)
+GO(gtk_stock_item_copy, pFp)
+GO(gtk_stock_item_free, vFp)
+GO(gtk_stock_list_ids, pFv)
+GO(gtk_stock_lookup, iFpp)
+GOM(gtk_stock_set_translate_func, vFEpppp)
+GO(gtk_style_apply_default_background, vFppiipiiii)
+GO(gtk_style_attach, pFpp)
+GO(gtk_style_context_add_class, vFpp)
+GO(gtk_style_context_add_provider, vFppu)
+GO(gtk_style_context_add_provider_for_screen, vFppu)
+GO(gtk_style_context_add_region, vFppi)
+GO(gtk_style_context_cancel_animations, vFpp)
+//GO2(gtk_style_context_get, vFppV, gtk_style_context_get_valist)
+GO(gtk_style_context_get_border, vFpip)
+GO(gtk_style_context_get_background_color, vFpip)
+GO(gtk_style_context_get_border_color, vFpip)
+GO(gtk_style_context_get_color, vFpip)
+GO(gtk_style_context_get_direction, iFp)
+GO(gtk_style_context_get_font, pFpi)
+GO(gtk_style_context_get_junction_sides, iFp)
+GO(gtk_style_context_get_margin, vFpip)
+GO(gtk_style_context_get_padding, vFpip)
+GO(gtk_style_context_get_parent, pFp)
+GO(gtk_style_context_get_path, pFp)
+GO(gtk_style_context_get_property, vFppip)
+GO(gtk_style_context_get_frame_clock, pFp)
+GO(gtk_style_context_get_scale, iFp)
+GO(gtk_style_context_get_screen, pFp)
+GO(gtk_style_context_get_section, pFpp)
+GO(gtk_style_context_get_state, iFp)
+//GO2(gtk_style_context_get_style, vFpV, gtk_style_context_get_style_valist)
+GO(gtk_style_context_get_style_property, vFppp)
+//GO(gtk_style_context_get_style_valist, vFpA)
+//GO(gtk_style_context_get_valist, vFppp)
+GO(gtk_style_context_has_class, iFpp)
+GO(gtk_style_context_has_region, iFppp)
+GO(gtk_style_context_invalidate, vFp)
+GO(gtk_style_context_list_classes, pFp)
+GO(gtk_style_context_list_regions, pFp)
+GO(gtk_style_context_lookup_color, iFppp)
+GO(gtk_style_context_lookup_icon_set, pFpp)
+GO(gtk_style_context_new, pFv)
+GO(gtk_style_context_notify_state_change, vFpppip)
+GO(gtk_style_context_pop_animatable_region, vFp)
+GO(gtk_style_context_push_animatable_region, vFpp)
+GO(gtk_style_context_restore, vFp)
+GO(gtk_style_context_remove_class, vFpp)
+GO(gtk_style_context_remove_provider, vFpp)
+GO(gtk_style_context_remove_provider_for_screen, vFpp)
+GO(gtk_style_context_remove_region, vFpp)
+GO(gtk_style_context_reset_widgets, vFp)
+GO(gtk_style_context_save, vFp)
+GO(gtk_style_context_scroll_animations, vFppii)
+GO(gtk_style_context_set_background, vFpp)
+GO(gtk_style_context_set_direction, vFpi)
+GO(gtk_style_context_set_frame_clock, vFpp)
+GO(gtk_style_context_set_junction_sides, vFpi)
+GO(gtk_style_context_set_parent, vFpp)
+GO(gtk_style_context_set_path, vFpp)
+GO(gtk_style_context_set_scale, vFpi)
+GO(gtk_style_context_set_screen, vFpp)
+GO(gtk_style_context_set_state, vFpi)
+GO(gtk_style_context_state_is_running, iFpip)
+GO(gtk_style_context_to_string, pFpi)
+GO(gtk_style_copy, pFp)
+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, vFpipp)
+GO(gtk_style_get_type, iFv)
+//GO(gtk_style_get_valist, vFpipA)
+GO(gtk_style_lookup_color, iFppp)
+GO(gtk_style_lookup_icon_set, pFpp)
+GO(gtk_style_new, pFv)
+GO(gtk_style_ref, pFp)
+GO(gtk_style_render_icon, pFppiiipp)
+GO(gtk_style_set_background, vFppi)
+GO(gtk_style_set_font, vFpp)
+GO(gtk_style_provider_get_type, pFv)
+GO(gtk_style_unref, vFp)
+GO(gtk_submenu_direction_get_type, iFv)
+GO(gtk_submenu_placement_get_type, iFv)
+GO(gtk_table_attach, vFppuuuuiiuu)
+GO(gtk_table_attach_defaults, vFppuuuu)
+GO(gtk_table_get_col_spacing, uFpu)
+GO(gtk_table_get_default_col_spacing, uFp)
+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, iFv)
+GO(gtk_table_new, pFuui)
+GO(gtk_table_resize, vFpuu)
+GO(gtk_table_set_col_spacing, vFpuu)
+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_flags_get_type, iFv)
+GO(gtk_target_list_add, vFppuu)
+GO(gtk_target_list_add_image_targets, vFpui)
+GO(gtk_target_list_add_rich_text_targets, vFpuip)
+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, iFv)
+GO(gtk_target_list_new, pFpu)
+GO(gtk_target_list_ref, pFp)
+GO(gtk_target_list_remove, iFppp)
+GO(gtk_target_list_unref, vFp)
+GO(gtk_targets_include_image, iFpii)
+GO(gtk_targets_include_rich_text, iFpip)
+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, iFv)
+GO(gtk_tearoff_menu_item_new, pFv)
+//GO(gtk_test_create_simple_window, 
+//GO(gtk_test_create_widget, 
+//GO(gtk_test_display_button_window, 
+//GO(gtk_test_find_label, 
+//GO(gtk_test_find_sibling, 
+//GO(gtk_test_find_widget, 
+//GO(gtk_test_init, 
+//GO(gtk_test_list_all_types, 
+//GO(gtk_test_register_all_types, 
+//GO(gtk_test_slider_get_value, 
+//GO(gtk_test_slider_set_perc, 
+//GO(gtk_test_spin_button_click, 
+//GO(gtk_test_text_get, 
+//GO(gtk_test_text_set, 
+//GO(gtk_test_widget_click, 
+//GO(gtk_test_widget_send_key, 
+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, iFv)
+GO(gtk_text_attributes_new, pFv)
+GO(gtk_text_attributes_ref, pFp)
+GO(gtk_text_attributes_unref, vFp)
+GO(gtk_text_backward_delete, iFpu)
+GO(gtk_text_buffer_add_mark, vFpp)
+GO(gtk_text_buffer_add_selection_clipboard, vFpp)
+GO(gtk_text_buffer_apply_tag, vFpppp)
+GO(gtk_text_buffer_apply_tag_by_name, vFpp)
+GO(gtk_text_buffer_backspace, iFppii)
+GO(gtk_text_buffer_begin_user_action, vFp)
+GO(gtk_text_buffer_copy_clipboard, vFpp)
+GO(gtk_text_buffer_create_child_anchor, pFpp)
+GO(gtk_text_buffer_create_mark, pFpppi)
+GO(gtk_text_buffer_create_tag, pFppppppppppppppp) //vaarg after 3 p
+GO(gtk_text_buffer_cut_clipboard, vFppi)
+GO(gtk_text_buffer_delete, vFppp)
+GO(gtk_text_buffer_delete_interactive, iFpppi)
+GO(gtk_text_buffer_delete_mark, vFpp)
+GO(gtk_text_buffer_delete_mark_by_name, vFpp)
+GO(gtk_text_buffer_delete_selection, iFpii)
+GO(gtk_text_buffer_deserialize, iFpppppup)
+GO(gtk_text_buffer_deserialize_get_can_create_tags, iFpp)
+GO(gtk_text_buffer_deserialize_set_can_create_tags, vFppi)
+GO(gtk_text_buffer_end_user_action, vFp)
+GO(gtk_text_buffer_get_bounds, vFppp)
+GO(gtk_text_buffer_get_char_count, iFp)
+GO(gtk_text_buffer_get_copy_target_list, pFp)
+GO(gtk_text_buffer_get_deserialize_formats, pFpp)
+GO(gtk_text_buffer_get_end_iter, vFpp)
+GO(gtk_text_buffer_get_has_selection, iFp)
+GO(gtk_text_buffer_get_insert, pFp)
+GO(gtk_text_buffer_get_iter_at_child_anchor, vFppp)
+GO(gtk_text_buffer_get_iter_at_line, vFppi)
+GO(gtk_text_buffer_get_iter_at_line_index, vFppii)
+GO(gtk_text_buffer_get_iter_at_line_offset, vFppii)
+GO(gtk_text_buffer_get_iter_at_mark, vFppp)
+GO(gtk_text_buffer_get_iter_at_offset, vFppi)
+GO(gtk_text_buffer_get_line_count, iFp)
+GO(gtk_text_buffer_get_mark, pFpp)
+GO(gtk_text_buffer_get_modified, iFp)
+GO(gtk_text_buffer_get_paste_target_list, pFp)
+GO(gtk_text_buffer_get_selection_bound, pFp)
+GO(gtk_text_buffer_get_selection_bounds, iFppp)
+GO(gtk_text_buffer_get_serialize_formats, pFpp)
+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, iFv)
+GO(gtk_text_buffer_insert, vFpppi)
+GO(gtk_text_buffer_insert_at_cursor, vFppi)
+GO(gtk_text_buffer_insert_child_anchor, vFppp)
+GO(gtk_text_buffer_insert_interactive, iFpppii)
+GO(gtk_text_buffer_insert_interactive_at_cursor, iFppii)
+GO(gtk_text_buffer_insert_pixbuf, vFppp)
+GO(gtk_text_buffer_insert_range, vFpppp)
+GO(gtk_text_buffer_insert_range_interactive, iFppppi)
+GO(gtk_text_buffer_insert_with_tags, vFpppipppppppppppppp)
+GO(gtk_text_buffer_insert_with_tags_by_name, vFpppippppppppppp)
+GO(gtk_text_buffer_move_mark, vFppp)
+GO(gtk_text_buffer_move_mark_by_name, vFppp)
+GO(gtk_text_buffer_new, pFp)
+GO(gtk_text_buffer_paste_clipboard, vFpppi)
+GO(gtk_text_buffer_place_cursor, vFpp)
+//GOM(gtk_text_buffer_register_deserialize_format, pFEppBpB)
+GO(gtk_text_buffer_register_deserialize_tagset, pFpp)
+//GOM(gtk_text_buffer_register_serialize_format, pFppBpB)
+GO(gtk_text_buffer_register_serialize_tagset, pFpp)
+GO(gtk_text_buffer_remove_all_tags, vFppp)
+GO(gtk_text_buffer_remove_selection_clipboard, vFpp)
+GO(gtk_text_buffer_remove_tag, vFpppp)
+GO(gtk_text_buffer_remove_tag_by_name, vFpppp)
+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, iFv)
+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, iFv)
+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, iFv)
+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, iFv)
+GO(gtk_text_insert, vFpppppi)
+GO(gtk_text_iter_backward_char, iFp)
+GO(gtk_text_iter_backward_chars, iFpi)
+GO(gtk_text_iter_backward_cursor_position, iFp)
+GO(gtk_text_iter_backward_cursor_positions, iFpi)
+GOM(gtk_text_iter_backward_find_char, iFEpppp)
+GO(gtk_text_iter_backward_line, iFp)
+GO(gtk_text_iter_backward_lines, iFpi)
+GO(gtk_text_iter_backward_search, iFppuppp)
+GO(gtk_text_iter_backward_sentence_start, iFp)
+GO(gtk_text_iter_backward_sentence_starts, iFpi)
+GO(gtk_text_iter_backward_to_tag_toggle, iFpp)
+GO(gtk_text_iter_backward_visible_cursor_position, iFp)
+GO(gtk_text_iter_backward_visible_cursor_positions, iFpi)
+GO(gtk_text_iter_backward_visible_line, iFp)
+GO(gtk_text_iter_backward_visible_lines, iFpi)
+GO(gtk_text_iter_backward_visible_word_start, iFp)
+GO(gtk_text_iter_backward_visible_word_starts, iFpi)
+GO(gtk_text_iter_backward_word_start, iFp)
+GO(gtk_text_iter_backward_word_starts, iFpi)
+GO(gtk_text_iter_begins_tag, iFpp)
+GO(gtk_text_iter_can_insert, iFpi)
+GO(gtk_text_iter_compare, iFpp)
+GO(gtk_text_iter_copy, pFp)
+GO(gtk_text_iter_editable, iFpi)
+GO(gtk_text_iter_ends_line, iFp)
+GO(gtk_text_iter_ends_sentence, iFp)
+GO(gtk_text_iter_ends_tag, iFpp)
+GO(gtk_text_iter_ends_word, iFp)
+GO(gtk_text_iter_equal, iFpp)
+GO(gtk_text_iter_forward_char, iFp)
+GO(gtk_text_iter_forward_chars, iFpi)
+GO(gtk_text_iter_forward_cursor_position, iFp)
+GO(gtk_text_iter_forward_cursor_positions, iFpi)
+GOM(gtk_text_iter_forward_find_char, iFEpppp)
+GO(gtk_text_iter_forward_line, iFp)
+GO(gtk_text_iter_forward_lines, iFpi)
+GO(gtk_text_iter_forward_search, iFppuppp)
+GO(gtk_text_iter_forward_sentence_end, iFp)
+GO(gtk_text_iter_forward_sentence_ends, iFpi)
+GO(gtk_text_iter_forward_to_end, iFp)
+GO(gtk_text_iter_forward_to_line_end, iFp)
+GO(gtk_text_iter_forward_to_tag_toggle, iFpp)
+GO(gtk_text_iter_forward_visible_cursor_position, iFp)
+GO(gtk_text_iter_forward_visible_cursor_positions, iFpi)
+GO(gtk_text_iter_forward_visible_line, iFp)
+GO(gtk_text_iter_forward_visible_lines, iFpi)
+GO(gtk_text_iter_forward_visible_word_end, iFp)
+GO(gtk_text_iter_forward_visible_word_ends, iFpi)
+GO(gtk_text_iter_forward_word_end, iFp)
+GO(gtk_text_iter_forward_word_ends, iFpi)
+GO(gtk_text_iter_free, vFp)
+GO(gtk_text_iter_get_attributes, iFpp)
+GO(gtk_text_iter_get_buffer, pFp)
+GO(gtk_text_iter_get_bytes_in_line, iFp)
+GO(gtk_text_iter_get_char, uFp)
+GO(gtk_text_iter_get_chars_in_line, iFp)
+GO(gtk_text_iter_get_child_anchor, pFp)
+GO(gtk_text_iter_get_language, pFp)
+GO(gtk_text_iter_get_line, iFp)
+GO(gtk_text_iter_get_line_index, iFp)
+GO(gtk_text_iter_get_line_offset, iFp)
+GO(gtk_text_iter_get_marks, pFp)
+GO(gtk_text_iter_get_offset, iFp)
+GO(gtk_text_iter_get_pixbuf, pFp)
+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, iFv)
+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)
+GO(gtk_text_iter_get_visible_text, pFpp)
+GO(gtk_text_iter_has_tag, iFpp)
+GO(gtk_text_iter_in_range, iFppp)
+GO(gtk_text_iter_inside_sentence, iFp)
+GO(gtk_text_iter_inside_word, iFp)
+GO(gtk_text_iter_is_cursor_position, iFp)
+GO(gtk_text_iter_is_end, iFp)
+GO(gtk_text_iter_is_start, iFp)
+GO(gtk_text_iter_order, vFpp)
+GO(gtk_text_iter_set_line, vFpi)
+GO(gtk_text_iter_set_line_index, vFpi)
+GO(gtk_text_iter_set_line_offset, vFpi)
+GO(gtk_text_iter_set_offset, vFpi)
+GO(gtk_text_iter_set_visible_line_index, vFpi)
+GO(gtk_text_iter_set_visible_line_offset, vFpi)
+GO(gtk_text_iter_starts_line, iFp)
+GO(gtk_text_iter_starts_sentence, iFp)
+GO(gtk_text_iter_starts_word, iFp)
+GO(gtk_text_iter_toggles_tag, iFpp)
+//GO(gtk_text_layout_changed, 
+//GO(gtk_text_layout_clamp_iter_to_vrange, 
+//GO(gtk_text_layout_cursors_changed, 
+//GO(gtk_text_layout_default_style_changed, 
+//GO(gtk_text_layout_draw, 
+//GO(gtk_text_layout_free_line_data, 
+//GO(gtk_text_layout_free_line_display, 
+//GO(gtk_text_layout_get_buffer, 
+//GO(gtk_text_layout_get_cursor_locations, 
+//GO(gtk_text_layout_get_cursor_visible, 
+//GO(gtk_text_layout_get_iter_at_line, 
+//GO(gtk_text_layout_get_iter_at_pixel, 
+//GO(gtk_text_layout_get_iter_at_position, 
+//GO(gtk_text_layout_get_iter_location, 
+//GO(gtk_text_layout_get_line_at_y, 
+//GO(gtk_text_layout_get_line_display, 
+//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, iFv)
+//GO(gtk_text_layout_invalidate, 
+//GO(gtk_text_layout_invalidate_cursors, 
+//GO(gtk_text_layout_is_valid, 
+//GO(gtk_text_layout_iter_starts_line, 
+//GO(gtk_text_layout_move_iter_to_line_end, 
+//GO(gtk_text_layout_move_iter_to_next_line, 
+//GO(gtk_text_layout_move_iter_to_previous_line, 
+//GO(gtk_text_layout_move_iter_to_x, 
+//GO(gtk_text_layout_move_iter_visually, 
+//GO(gtk_text_layout_new, 
+//GO(gtk_text_layout_set_buffer, 
+//GO(gtk_text_layout_set_contexts, 
+//GO(gtk_text_layout_set_cursor_direction, 
+//GO(gtk_text_layout_set_cursor_visible, 
+//GO(gtk_text_layout_set_default_style, 
+//GO(gtk_text_layout_set_keyboard_direction, 
+//GO(gtk_text_layout_set_overwrite_mode, 
+//GO(gtk_text_layout_set_preedit_string, 
+//GO(gtk_text_layout_set_screen_width, 
+//GO(gtk_text_layout_spew, 
+//GO(gtk_text_layout_validate, 
+//GO(gtk_text_layout_validate_yrange, 
+//GO(gtk_text_layout_wrap, 
+//GO(gtk_text_layout_wrap_loop_end, 
+//GO(gtk_text_layout_wrap_loop_start, 
+//GO(gtk_text_line_segment_split, 
+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, iFv)
+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, iFv)
+GO(gtk_text_set_adjustments, vFppp)
+GO(gtk_text_set_editable, vFpi)
+GO(gtk_text_set_line_wrap, vFpi)
+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, iFv)
+GO(gtk_text_tag_new, pFp)
+GO(gtk_text_tag_set_priority, vFpi)
+GO(gtk_text_tag_table_add, vFpp)
+//GOM(gtk_text_tag_table_foreach, vFEpBp)
+GO(gtk_text_tag_table_get_size, iFp)
+GO(gtk_text_tag_table_get_type, iFv)
+GO(gtk_text_tag_table_lookup, pFpp)
+GO(gtk_text_tag_table_new, pFv)
+GO(gtk_text_tag_table_remove, vFpp)
+GO(gtk_text_thaw, vFp)
+GO(gtk_text_view_add_child_at_anchor, vFppp)
+GO(gtk_text_view_add_child_in_window, vFppiii)
+GO(gtk_text_view_backward_display_line, iFpp)
+GO(gtk_text_view_backward_display_line_start, iFpp)
+GO(gtk_text_view_buffer_to_window_coords, vFpiiipp)
+GO(gtk_text_view_forward_display_line, iFpp)
+GO(gtk_text_view_forward_display_line_end, iFpp)
+GO(gtk_text_view_get_accepts_tab, iFp)
+GO(gtk_text_view_get_border_window_size, iFpi)
+GO(gtk_text_view_get_buffer, pFp)
+GO(gtk_text_view_get_cursor_visible, iFp)
+GO(gtk_text_view_get_default_attributes, pFp)
+GO(gtk_text_view_get_editable, iFp)
+GO(gtk_text_view_get_hadjustment, pFp)
+GO(gtk_text_view_get_indent, iFp)
+GO(gtk_text_view_get_iter_at_location, vFppii)
+GO(gtk_text_view_get_iter_at_position, vFpppii)
+GO(gtk_text_view_get_iter_location, vFppp)
+GO(gtk_text_view_get_justification, iFp)
+GO(gtk_text_view_get_left_margin, iFp)
+GO(gtk_text_view_get_line_at_y, vFppip)
+GO(gtk_text_view_get_line_yrange, vFpppp)
+GO(gtk_text_view_get_overwrite, iFp)
+GO(gtk_text_view_get_pixels_above_lines, iFp)
+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, iFv)
+GO(gtk_text_view_get_vadjustment, pFp)
+GO(gtk_text_view_get_visible_rect, vFpp)
+GO(gtk_text_view_get_window, pFpi)
+GO(gtk_text_view_get_window_type, iFpp)
+GO(gtk_text_view_get_wrap_mode, iFp)
+GO(gtk_text_view_im_context_filter_keypress, iFpp)
+GO(gtk_text_view_move_child, vFppii)
+GO(gtk_text_view_move_mark_onscreen, iFpp)
+GO(gtk_text_view_move_visually, iFppi)
+GO(gtk_text_view_new, pFv)
+GO(gtk_text_view_new_with_buffer, pFp)
+GO(gtk_text_view_place_cursor_onscreen, iFp)
+GO(gtk_text_view_reset_im_context, vFp)
+GO(gtk_text_view_scroll_mark_onscreen, vFpp)
+GO(gtk_text_view_scroll_to_iter, iFppdidd)
+GO(gtk_text_view_scroll_to_mark, vFppdidd)
+GO(gtk_text_view_set_accepts_tab, vFpi)
+GO(gtk_text_view_set_border_window_size, vFpii)
+GO(gtk_text_view_set_buffer, vFpp)
+GO(gtk_text_view_set_cursor_visible, vFpi)
+GO(gtk_text_view_set_editable, vFpi)
+GO(gtk_text_view_set_indent, vFpi)
+GO(gtk_text_view_set_justification, vFpi)
+GO(gtk_text_view_set_left_margin, vFpi)
+GO(gtk_text_view_set_overwrite, vFpi)
+GO(gtk_text_view_set_pixels_above_lines, vFpi)
+GO(gtk_text_view_set_pixels_below_lines, vFpi)
+GO(gtk_text_view_set_pixels_inside_wrap, vFpi)
+GO(gtk_text_view_set_right_margin, vFpi)
+GO(gtk_text_view_set_tabs, vFpp)
+GO(gtk_text_view_set_wrap_mode, vFpi)
+GO(gtk_text_view_starts_display_line, iFpp)
+GO(gtk_text_view_window_to_buffer_coords, vFpiiipp)
+GO(gtk_text_window_type_get_type, iFv)
+//GO(gtk_theme_engine_create_rc_style, 
+//GO(gtk_theme_engine_get, 
+GO(gtk_theme_engine_get_type, iFv)
+GOM(gtk_timeout_add, uFEupp)
+//GOM(gtk_timeout_add_full, uFuBppB)
+GO(gtk_timeout_remove, vFu)
+GO(gtk_tips_query_get_type, iFv)
+//GO(gtk_tips_query_new, 
+//GO(gtk_tips_query_set_caller, 
+//GO(gtk_tips_query_set_labels, 
+//GO(gtk_tips_query_start_query, 
+//GO(gtk_tips_query_stop_query, 
+//GO(gtk_toggle_action_get_active, 
+//GO(gtk_toggle_action_get_draw_as_radio, 
+GO(gtk_toggle_action_get_type, iFv)
+//GO(gtk_toggle_action_new, 
+//GO(gtk_toggle_action_set_active, 
+//GO(gtk_toggle_action_set_draw_as_radio, 
+//GO(gtk_toggle_action_toggled, 
+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, iFv)
+GO(gtk_toggle_button_new, pFv)
+GO(gtk_toggle_button_new_with_label, pFp)
+GO(gtk_toggle_button_new_with_mnemonic, pFp)
+GO(gtk_toggle_button_set_active, vFpi)
+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, iFv)
+GO(gtk_toggle_tool_button_new, pFv)
+GO(gtk_toggle_tool_button_new_from_stock, pFp)
+GO(gtk_toggle_tool_button_set_active, vFpi)
+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, iFv)
+GO(gtk_toolbar_get_drop_index, iFpii)
+GO(gtk_toolbar_get_icon_size, iFp)
+GO(gtk_toolbar_get_item_index, iFpp)
+GO(gtk_toolbar_get_n_items, iFp)
+GO(gtk_toolbar_get_nth_item, pFpi)
+GO(gtk_toolbar_get_orientation, iFp)
+GO(gtk_toolbar_get_relief_style, iFp)
+GO(gtk_toolbar_get_show_arrow, iFp)
+GO(gtk_toolbar_get_style, iFp)
+GO(gtk_toolbar_get_tooltips, iFp)
+GO(gtk_toolbar_get_type, iFv)
+GO(gtk_toolbar_insert, vFppi)
+GOM(gtk_toolbar_insert_element, pFEpipppppppi)
+GOM(gtk_toolbar_insert_item, pFEpppppppi)
+GO(gtk_toolbar_insert_space, vFpi)
+GOM(gtk_toolbar_insert_stock, pFEppppppi)
+GO(gtk_toolbar_insert_widget, vFppppi)
+GO(gtk_toolbar_new, pFv)
+GOM(gtk_toolbar_prepend_element, pFEpippppppp)
+GOM(gtk_toolbar_prepend_item, pFEppppppp)
+GO(gtk_toolbar_prepend_space, vFp)
+GO(gtk_toolbar_prepend_widget, vFpppp)
+GO(gtk_toolbar_remove_space, vFpi)
+GO(gtk_toolbar_set_drop_highlight_item, vFppi)
+GO(gtk_toolbar_set_icon_size, vFpi)
+GO(gtk_toolbar_set_orientation, vFpi)
+GO(gtk_toolbar_set_show_arrow, vFpi)
+GO(gtk_toolbar_set_style, vFpi)
+GO(gtk_toolbar_set_tooltips, vFpi)
+GO(gtk_toolbar_space_style_get_type, iFv)
+GO(gtk_toolbar_style_get_type, iFv)
+GO(gtk_toolbar_unset_icon_size, vFp)
+GO(gtk_toolbar_unset_style, vFp)
+GO(gtk_tool_button_get_icon_name, pFp)
+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, iFv)
+GO(gtk_tool_button_get_use_underline, iFp)
+GO(gtk_tool_button_new, pFpp)
+GO(gtk_tool_button_new_from_stock, pFp)
+GO(gtk_tool_button_set_icon_name, vFpp)
+GO(gtk_tool_button_set_icon_widget, vFpp)
+GO(gtk_tool_button_set_label, vFpp)
+GO(gtk_tool_button_set_label_widget, vFpp)
+GO(gtk_tool_button_set_stock_id, vFpp)
+GO(gtk_tool_button_set_use_underline, vFpi)
+//GO(gtk_tool_item_get_ellipsize_mode, 
+//GO(gtk_tool_item_get_expand, 
+//GO(gtk_tool_item_get_homogeneous, 
+//GO(gtk_tool_item_get_icon_size, 
+//GO(gtk_tool_item_get_is_important, 
+//GO(gtk_tool_item_get_orientation, 
+//GO(gtk_tool_item_get_proxy_menu_item, 
+//GO(gtk_tool_item_get_relief_style, 
+//GO(gtk_tool_item_get_text_alignment, 
+//GO(gtk_tool_item_get_text_orientation, 
+//GO(gtk_tool_item_get_text_size_group, 
+//GO(gtk_tool_item_get_toolbar_style, 
+GO(gtk_tool_item_get_type, iFv)
+//GO(gtk_tool_item_get_use_drag_window, 
+//GO(gtk_tool_item_get_visible_horizontal, 
+//GO(gtk_tool_item_get_visible_vertical, 
+//GO(gtk_tool_item_group_get_collapsed, 
+//GO(gtk_tool_item_group_get_drop_item, 
+//GO(gtk_tool_item_group_get_ellipsize, 
+//GO(gtk_tool_item_group_get_header_relief, 
+//GO(gtk_tool_item_group_get_item_position, 
+//GO(gtk_tool_item_group_get_label, 
+//GO(gtk_tool_item_group_get_label_widget, 
+//GO(gtk_tool_item_group_get_n_items, 
+//GO(gtk_tool_item_group_get_nth_item, 
+GO(gtk_tool_item_group_get_type, iFv)
+//GO(gtk_tool_item_group_insert, 
+//GO(gtk_tool_item_group_new, 
+//GO(gtk_tool_item_group_set_collapsed, 
+//GO(gtk_tool_item_group_set_ellipsize, 
+//GO(gtk_tool_item_group_set_header_relief, 
+//GO(gtk_tool_item_group_set_item_position, 
+//GO(gtk_tool_item_group_set_label, 
+//GO(gtk_tool_item_group_set_label_widget, 
+//GO(gtk_tool_item_new, 
+//GO(gtk_tool_item_rebuild_menu, 
+//GO(gtk_tool_item_retrieve_proxy_menu_item, 
+//GO(gtk_tool_item_set_expand, 
+//GO(gtk_tool_item_set_homogeneous, 
+//GO(gtk_tool_item_set_is_important, 
+//GO(gtk_tool_item_set_proxy_menu_item, 
+//GO(gtk_tool_item_set_tooltip, 
+//GO(gtk_tool_item_set_tooltip_markup, 
+//GO(gtk_tool_item_set_tooltip_text, 
+//GO(gtk_tool_item_set_use_drag_window, 
+//GO(gtk_tool_item_set_visible_horizontal, 
+//GO(gtk_tool_item_set_visible_vertical, 
+//GO(gtk_tool_item_toolbar_reconfigured, 
+//GO(gtk_tool_palette_add_drag_dest, 
+GO(gtk_tool_palette_drag_targets_get_type, iFv)
+//GO(gtk_tool_palette_get_drag_item, 
+//GO(gtk_tool_palette_get_drag_target_group, 
+//GO(gtk_tool_palette_get_drag_target_item, 
+//GO(gtk_tool_palette_get_drop_group, 
+//GO(gtk_tool_palette_get_drop_item, 
+//GO(gtk_tool_palette_get_exclusive, 
+//GO(gtk_tool_palette_get_expand, 
+//GO(gtk_tool_palette_get_group_position, 
+//GO(gtk_tool_palette_get_hadjustment, 
+//GO(gtk_tool_palette_get_icon_size, 
+//GO(gtk_tool_palette_get_style, 
+GO(gtk_tool_palette_get_type, iFv)
+//GO(gtk_tool_palette_get_vadjustment, 
+//GO(gtk_tool_palette_new, 
+//GO(gtk_tool_palette_set_drag_source, 
+//GO(gtk_tool_palette_set_exclusive, 
+//GO(gtk_tool_palette_set_expand, 
+//GO(gtk_tool_palette_set_group_position, 
+//GO(gtk_tool_palette_set_icon_size, 
+//GO(gtk_tool_palette_set_style, 
+//GO(gtk_tool_palette_unset_icon_size, 
+//GO(gtk_tool_palette_unset_style, 
+//GO(gtk_tool_shell_get_ellipsize_mode, 
+//GO(gtk_tool_shell_get_icon_size, 
+//GO(gtk_tool_shell_get_orientation, 
+//GO(gtk_tool_shell_get_relief_style, 
+//GO(gtk_tool_shell_get_style, 
+//GO(gtk_tool_shell_get_text_alignment, 
+//GO(gtk_tool_shell_get_text_orientation, 
+//GO(gtk_tool_shell_get_text_size_group, 
+GO(gtk_tool_shell_get_type, iFv)
+//GO(gtk_tool_shell_rebuild_menu, 
+GO(gtk_tooltip_get_type, iFv)
+GO(gtk_tooltips_data_get, pFp)
+GO(gtk_tooltips_disable, vFp)
+GO(gtk_tooltips_enable, vFp)
+//GO(gtk_tooltip_set_custom, 
+//GO(gtk_tooltip_set_icon, 
+//GO(gtk_tooltip_set_icon_from_gicon, 
+//GO(gtk_tooltip_set_icon_from_icon_name, 
+//GO(gtk_tooltip_set_icon_from_stock, 
+//GO(gtk_tooltip_set_markup, 
+//GO(gtk_tooltip_set_text, 
+//GO(gtk_tooltip_set_tip_area, 
+GO(gtk_tooltips_force_window, vFp)
+GO(gtk_tooltips_get_info_from_tip_window, iFppp)
+GO(gtk_tooltips_get_type, iFv)
+GO(gtk_tooltips_new, pFv)
+GO(gtk_tooltips_set_delay, vFpu)
+GO(gtk_tooltips_set_tip, vFpppp)
+//GO(gtk_tooltip_trigger_tooltip_query, 
+GO(gtk_tray_icon_get_type, iFv)
+//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, iFv)
+//GO(gtk_tree_drag_dest_row_drop_possible, 
+//GO(gtk_tree_drag_source_drag_data_delete, 
+//GO(gtk_tree_drag_source_drag_data_get, 
+GO(gtk_tree_drag_source_get_type, iFv)
+//GO(gtk_tree_drag_source_row_draggable, 
+//GO(gtk_tree_get_row_drag_data, 
+GO(gtk_tree_get_type, iFv)
+//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, iFv)
+//GO(gtk_tree_item_new, 
+//GO(gtk_tree_item_new_with_label, 
+//GO(gtk_tree_item_remove_subtree, 
+//GO(gtk_tree_item_select, 
+//GO(gtk_tree_item_set_subtree, 
+GO(gtk_tree_iter_copy, pFp)
+GO(gtk_tree_iter_free, vFp)
+GO(gtk_tree_iter_get_type, iFv)
+//GO(gtk_tree_model_filter_clear_cache, 
+//GO(gtk_tree_model_filter_convert_child_iter_to_iter, 
+//GO(gtk_tree_model_filter_convert_child_path_to_path, 
+//GO(gtk_tree_model_filter_convert_iter_to_child_iter, 
+//GO(gtk_tree_model_filter_convert_path_to_child_path, 
+//GO(gtk_tree_model_filter_get_model, 
+GO(gtk_tree_model_filter_get_type, iFv)
+//GO(gtk_tree_model_filter_new, 
+//GO(gtk_tree_model_filter_refilter, 
+//GO(gtk_tree_model_filter_set_modify_func, 
+//GO(gtk_tree_model_filter_set_visible_column, 
+//GO(gtk_tree_model_filter_set_visible_func, 
+GO(gtk_tree_model_flags_get_type, iFv)
+//GOM(gtk_tree_model_foreach, vFEpBp)
+//GO2(gtk_tree_model_get, vFppV, gtk_tree_model_get_valist)
+GO(gtk_tree_model_get_column_type, iFpi)
+GO(gtk_tree_model_get_flags, iFp)
+GO(gtk_tree_model_get_iter, iFppp)
+GO(gtk_tree_model_get_iter_first, iFpp)
+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, iFv)
+//GO(gtk_tree_model_get_valist, vFppp)
+GO(gtk_tree_model_get_value, vFppip)
+GO(gtk_tree_model_iter_children, iFppp)
+GO(gtk_tree_model_iter_has_child, iFpp)
+GO(gtk_tree_model_iter_n_children, iFpp)
+GO(gtk_tree_model_iter_next, iFpp)
+GO(gtk_tree_model_iter_nth_child, iFpppi)
+GO(gtk_tree_model_iter_parent, iFppp)
+GO(gtk_tree_model_ref_node, vFpp)
+GO(gtk_tree_model_row_changed, vFppp)
+GO(gtk_tree_model_row_deleted, vFpp)
+GO(gtk_tree_model_row_has_child_toggled, vFppp)
+GO(gtk_tree_model_row_inserted, vFppp)
+GO(gtk_tree_model_rows_reordered, vFpppp)
+//GO(gtk_tree_model_sort_clear_cache, 
+//GO(gtk_tree_model_sort_convert_child_iter_to_iter, 
+//GO(gtk_tree_model_sort_convert_child_path_to_path, 
+//GO(gtk_tree_model_sort_convert_iter_to_child_iter, 
+//GO(gtk_tree_model_sort_convert_path_to_child_path, 
+//GO(gtk_tree_model_sort_get_model, 
+GO(gtk_tree_model_sort_get_type, iFv)
+//GO(gtk_tree_model_sort_iter_is_valid, 
+//GO(gtk_tree_model_sort_new_with_model, 
+//GO(gtk_tree_model_sort_reset_default_sort_func, 
+GO(gtk_tree_model_unref_node, vFpp)
+//GO(gtk_tree_new, 
+GO(gtk_tree_path_append_index, vFpi)
+GO(gtk_tree_path_compare, iFpp)
+GO(gtk_tree_path_copy, pFp)
+GO(gtk_tree_path_down, vFp)
+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, iFv)
+GO(gtk_tree_path_is_ancestor, iFpp)
+GO(gtk_tree_path_is_descendant, iFpp)
+GO(gtk_tree_path_new, pFv)
+GO(gtk_tree_path_new_first, pFv)
+GO(gtk_tree_path_new_from_indices, pFippppppppppppppppp)  // vaarg
+GO(gtk_tree_path_new_from_string, pFp)
+GO(gtk_tree_path_next, vFp)
+GO(gtk_tree_path_prepend_index, vFpi)
+GO(gtk_tree_path_prev, vFp)
+GO(gtk_tree_path_to_string, pFp)
+GO(gtk_tree_path_up, iFp)
+//GO(gtk_tree_prepend, 
+//GO(gtk_tree_remove_item, 
+//GO(gtk_tree_remove_items, 
+GO(gtk_tree_row_reference_copy, pFp)
+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, iFv)
+GO(gtk_tree_row_reference_inserted, vFpp)
+GO(gtk_tree_row_reference_new, pFpp)
+GO(gtk_tree_row_reference_new_proxy, pFppp)
+GO(gtk_tree_row_reference_reordered, vFpppp)
+GO(gtk_tree_row_reference_valid, iFp)
+//GO(gtk_tree_select_child, 
+GO(gtk_tree_selection_count_selected_rows, iFp)
+GO(gtk_tree_selection_get_mode, iFp)
+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, iFv)
+//GOM(gtk_tree_selection_get_user_data, pFEp)
+GO(gtk_tree_selection_iter_is_selected, iFpp)
+GO(gtk_tree_selection_path_is_selected, iFpp)
+GO(gtk_tree_selection_select_all, vFp)
+//GOM(gtk_tree_selection_selected_foreach, vFEpBp)
+GO(gtk_tree_selection_select_iter, vFpp)
+GO(gtk_tree_selection_select_path, vFpp)
+GO(gtk_tree_selection_select_range, vFppp)
+GO(gtk_tree_selection_set_mode, vFpi)
+//GOM(gtk_tree_selection_set_select_function, vFEpBpB)
+GO(gtk_tree_selection_unselect_all, vFp)
+GO(gtk_tree_selection_unselect_iter, vFpp)
+GO(gtk_tree_selection_unselect_path, vFpp)
+GO(gtk_tree_selection_unselect_range, vFppp)
+//GO(gtk_tree_select_item, 
+//GO(gtk_tree_set_row_drag_data, 
+//GO(gtk_tree_set_selection_mode, 
+//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, iFv)
+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, vFpii)
+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, iFv)
+//GO(gtk_tree_store_insert, 
+//GO(gtk_tree_store_insert_after, 
+//GO(gtk_tree_store_insert_before, 
+//GO(gtk_tree_store_insert_with_values, 
+//GO(gtk_tree_store_insert_with_valuesv, 
+GO(gtk_tree_store_is_ancestor, iFppp)
+GO(gtk_tree_store_iter_depth, iFpp)
+GO(gtk_tree_store_iter_is_valid, iFpp)
+//GO(gtk_tree_store_move_after, 
+//GO(gtk_tree_store_move_before, 
+GO2(gtk_tree_store_new, pFuV, gtk_tree_store_newv)
+GO(gtk_tree_store_newv, pFup)
+GO(gtk_tree_store_prepend, vFppp)
+//GO(gtk_tree_store_remove, 
+GO(gtk_tree_store_reorder, vFppp)
+//GO2(gtk_tree_store_set, vFppV, gtk_tree_store_set_valist)
+//GO(gtk_tree_store_set_column_types, 
+//GO(gtk_tree_store_set_valist, vFppp)
+//GO(gtk_tree_store_set_value, 
+//GO(gtk_tree_store_set_valuesv, 
+//GO(gtk_tree_store_swap, 
+//GO(gtk_tree_unselect_child, 
+//GO(gtk_tree_unselect_item, 
+GO(gtk_tree_view_append_column, iFpp)
+GO(gtk_tree_view_collapse_all, vFp)
+GO(gtk_tree_view_collapse_row, iFpp)
+GO(gtk_tree_view_column_add_attribute, vFpppi)
+GO(gtk_tree_view_column_cell_get_position, iFpppp)
+GO(gtk_tree_view_column_cell_get_size, vFpppppp)
+GO(gtk_tree_view_column_cell_is_visible, iFp)
+GO(gtk_tree_view_column_cell_set_cell_data, vFpppii)
+GO(gtk_tree_view_column_clear, vFp)
+GO(gtk_tree_view_column_clear_attributes, vFpp)
+GO(gtk_tree_view_column_clicked, vFp)
+GO(gtk_tree_view_column_focus_cell, vFpp)
+GO(gtk_tree_view_column_get_alignment, fFp)
+GO(gtk_tree_view_column_get_cell_renderers, pFp)
+GO(gtk_tree_view_column_get_clickable, iFp)
+GO(gtk_tree_view_column_get_expand, iFp)
+GO(gtk_tree_view_column_get_fixed_width, iFp)
+GO(gtk_tree_view_column_get_max_width, iFp)
+GO(gtk_tree_view_column_get_min_width, iFp)
+GO(gtk_tree_view_column_get_reorderable, iFp)
+GO(gtk_tree_view_column_get_resizable, iFp)
+GO(gtk_tree_view_column_get_sizing, iFp)
+GO(gtk_tree_view_column_get_sort_column_id, iFp)
+GO(gtk_tree_view_column_get_sort_indicator, iFp)
+GO(gtk_tree_view_column_get_sort_order, iFp)
+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, iFv)
+GO(gtk_tree_view_column_get_visible, iFp)
+GO(gtk_tree_view_column_get_widget, pFp)
+GO(gtk_tree_view_column_get_width, iFp)
+GO(gtk_tree_view_column_new, pFv)
+GO(gtk_tree_view_column_new_with_attributes, pFppppppppppppp)   //vaarg
+GO(gtk_tree_view_column_pack_end, vFppi)
+GO(gtk_tree_view_column_pack_start, vFppi)
+GO(gtk_tree_view_column_queue_resize, vFp)
+GO(gtk_tree_view_columns_autosize, vFp)
+GO(gtk_tree_view_column_set_alignment, vFpf)
+GO(gtk_tree_view_column_set_attributes, vFpppppppppppp) //vaarg
+GOM(gtk_tree_view_column_set_cell_data_func, vFEppppp)
+GO(gtk_tree_view_column_set_clickable, vFpi)
+GO(gtk_tree_view_column_set_expand, vFpi)
+GO(gtk_tree_view_column_set_fixed_width, vFpi)
+GO(gtk_tree_view_column_set_max_width, vFpi)
+GO(gtk_tree_view_column_set_min_width, vFpi)
+GO(gtk_tree_view_column_set_reorderable, vFpi)
+GO(gtk_tree_view_column_set_resizable, vFpi)
+GO(gtk_tree_view_column_set_sizing, vFpi)
+GO(gtk_tree_view_column_set_sort_column_id, iFp)
+GO(gtk_tree_view_column_set_sort_indicator, vFpi)
+GO(gtk_tree_view_column_set_sort_order, vFpi)
+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, iFv)
+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)
+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, iFv)
+GO(gtk_tree_view_enable_model_drag_dest, vFppiu)
+GO(gtk_tree_view_enable_model_drag_source, vFpipiu)
+GO(gtk_tree_view_expand_all, vFp)
+GO(gtk_tree_view_expand_row, iFppi)
+GO(gtk_tree_view_expand_to_path, vFpp)
+GO(gtk_tree_view_get_background_area, vFpppp)
+GO(gtk_tree_view_get_bin_window, pFp)
+GO(gtk_tree_view_get_cell_area, vFpppp)
+GO(gtk_tree_view_get_column, pFpi)
+GO(gtk_tree_view_get_columns, pFp)
+GO(gtk_tree_view_get_cursor, vFppp)
+GO(gtk_tree_view_get_dest_row_at_pos, iFpiipp)
+GO(gtk_tree_view_get_drag_dest_row, vFppp)
+GO(gtk_tree_view_get_enable_search, iFp)
+GO(gtk_tree_view_get_enable_tree_lines, iFp)
+GO(gtk_tree_view_get_expander_column, pFp)
+GO(gtk_tree_view_get_fixed_height_mode, iFp)
+GO(gtk_tree_view_get_grid_lines, iFp)
+GO(gtk_tree_view_get_hadjustment, pFp)
+GO(gtk_tree_view_get_headers_clickable, iFp)
+GO(gtk_tree_view_get_headers_visible, iFp)
+GO(gtk_tree_view_get_hover_expand, iFp)
+GO(gtk_tree_view_get_hover_selection, iFp)
+GO(gtk_tree_view_get_level_indentation, iFp)
+GO(gtk_tree_view_get_model, pFp)
+GO(gtk_tree_view_get_path_at_pos, iFpiipppp)
+GO(gtk_tree_view_get_reorderable, iFp)
+//GOM(gtk_tree_view_get_row_separator_func, BFEp)
+GO(gtk_tree_view_get_rubber_banding, iFp)
+GO(gtk_tree_view_get_rules_hint, iFp)
+GO(gtk_tree_view_get_search_column, iFp)
+GO(gtk_tree_view_get_search_entry, pFp)
+//GOM(gtk_tree_view_get_search_equal_func, BFEp)
+//GOM(gtk_tree_view_get_search_position_func, BFEp)
+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, iFv)
+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, iFv)
+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, iFv)
+GO(gtk_tree_view_move_column_after, vFppp)
+GO(gtk_tree_view_new, pFv)
+GO(gtk_tree_view_new_with_model, pFp)
+GO(gtk_tree_view_remove_column, iFpp)
+GO(gtk_tree_view_row_activated, vFp)
+GO(gtk_tree_view_row_expanded, iFpp)
+GO(gtk_tree_view_scroll_to_cell, vFpppiff)
+GO(gtk_tree_view_scroll_to_point, vFpii)
+//GOM(gtk_tree_view_set_column_drag_function, vFEpBpB)
+GO(gtk_tree_view_set_cursor, vFpppi)
+GO(gtk_tree_view_set_cursor_on_cell, vFppppi)
+//GOM(gtk_tree_view_set_destroy_count_func, vFEpBpB)
+GO(gtk_tree_view_set_drag_dest_row, vFppi)
+GO(gtk_tree_view_set_enable_search, vFpi)
+GO(gtk_tree_view_set_enable_tree_lines, vFpi)
+GO(gtk_tree_view_set_expander_column, vFpp)
+GO(gtk_tree_view_set_fixed_height_mode, vFpi)
+GO(gtk_tree_view_set_grid_lines, vFpi)
+GO(gtk_tree_view_set_hadjustment, vFpp)
+GO(gtk_tree_view_set_headers_clickable, vFpi)
+GO(gtk_tree_view_set_headers_visible, vFpi)
+GO(gtk_tree_view_set_hover_expand, vFpi)
+GO(gtk_tree_view_set_hover_selection, vFpi)
+GO(gtk_tree_view_set_level_indentation, vFpi)
+GO(gtk_tree_view_set_model, vFpp)
+GO(gtk_tree_view_set_reorderable, vFpi)
+//GOM(gtk_tree_view_set_row_separator_func, vFEpBpB)
+GO(gtk_tree_view_set_rubber_banding, vFpi)
+GO(gtk_tree_view_set_rules_hint, vFpi)
+GO(gtk_tree_view_set_search_column, vFpi)
+GO(gtk_tree_view_set_search_entry, vFpp)
+GOM(gtk_tree_view_set_search_equal_func, vFEpppp)
+//GOM(gtk_tree_view_set_search_position_func, vFEpBpB)
+GO(gtk_tree_view_set_show_expanders, vFpi)
+GO(gtk_tree_view_set_tooltip_cell, vFppppp)
+GO(gtk_tree_view_set_tooltip_column, vFpi)
+GO(gtk_tree_view_set_tooltip_row, vFppp)
+GO(gtk_tree_view_set_vadjustment, vFpp)
+GO(gtk_tree_view_tree_to_widget_coords, vFpiipp)
+GO(gtk_tree_view_unset_rows_drag_dest, vFp)
+GO(gtk_tree_view_unset_rows_drag_source, vFp)
+GO(gtk_tree_view_widget_to_tree_coords, vFpiipp)
+GO(gtk_true, iFv)
+GOM(gtk_type_class, pFEi)
+GO(gtk_type_enum_find_value, pFip)
+GO(gtk_type_enum_get_values, pFi)
+GO(gtk_type_flags_find_value, pFip)
+GO(gtk_type_flags_get_values, pFi)
+GO(gtk_type_init, vFi)
+GO(gtk_type_new, pFi)
+GOM(gtk_type_unique, iFELp)
+//GO(gtk_ui_manager_add_ui, 
+//GO(gtk_ui_manager_add_ui_from_file, 
+//GO(gtk_ui_manager_add_ui_from_string, 
+//GO(gtk_ui_manager_ensure_update, 
+//GO(gtk_ui_manager_get_accel_group, 
+//GO(gtk_ui_manager_get_action, 
+//GO(gtk_ui_manager_get_action_groups, 
+//GO(gtk_ui_manager_get_add_tearoffs, 
+//GO(gtk_ui_manager_get_toplevels, 
+GO(gtk_ui_manager_get_type, iFv)
+//GO(gtk_ui_manager_get_ui, 
+//GO(gtk_ui_manager_get_widget, 
+//GO(gtk_ui_manager_insert_action_group, 
+GO(gtk_ui_manager_item_type_get_type, iFv)
+//GO(gtk_ui_manager_new, 
+//GO(gtk_ui_manager_new_merge_id, 
+//GO(gtk_ui_manager_remove_action_group, 
+//GO(gtk_ui_manager_remove_ui, 
+//GO(gtk_ui_manager_set_add_tearoffs, 
+GO(gtk_unit_get_type, iFv)
+GO(gtk_update_type_get_type, iFv)
+GO(gtk_vbox_get_type, iFv)
+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, iFv)
+//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, 
+GO(gtk_viewport_get_type, iFv)
+//GO(gtk_viewport_get_vadjustment, 
+//GO(gtk_viewport_get_view_window, 
+//GO(gtk_viewport_new, 
+//GO(gtk_viewport_set_hadjustment, 
+//GO(gtk_viewport_set_shadow_type, 
+//GO(gtk_viewport_set_vadjustment, 
+GO(gtk_visibility_get_type, iFv)
+GO(gtk_volume_button_get_type, iFv)
+GO(gtk_volume_button_new, pFv)
+GO(gtk_vpaned_get_type, iFv)
+GO(gtk_vpaned_new, pFv)
+GO(gtk_vruler_get_type, iFv)
+GO(gtk_vruler_new, pFv)
+GO(gtk_vscale_get_type, iFv)
+GO(gtk_vscale_new, pFp)
+GO(gtk_vscale_new_with_range, pFddd)
+GO(gtk_vscrollbar_get_type, iFv)
+GO(gtk_vscrollbar_new, pFp)
+GO(gtk_vseparator_get_type, iFv)
+GO(gtk_vseparator_new, pFv)
+GO(gtk_widget_activate, iFp)
+GO(gtk_widget_add_accelerator, vFpppuii)
+GO(gtk_widget_add_events, vFpi)
+GO(gtk_widget_add_mnemonic_label, vFpp)
+GO(gtk_widget_can_activate_accel, iFpu)
+GO(gtk_widget_child_focus, iFpi)
+GO(gtk_widget_child_notify, vFp)
+GO(gtk_widget_class_bind_template_child_full, vFppil)
+//GOM(gtk_widget_class_bind_template_callback_full, vFEppB)
+GO(gtk_widget_class_find_style_property, pFpp)
+GO(gtk_widget_class_install_style_property, vFpp)
+//GOM(gtk_widget_class_install_style_property_parser, vFEppB)
+GO(gtk_widget_class_list_style_properties, pFpp)
+GO(gtk_widget_class_path, vFpppp)
+//GOM(gtk_widget_class_set_connect_func, vFEpBpB)
+GO(gtk_widget_compute_expand, iFpi)
+GO(gtk_widget_create_pango_context, pFp)
+GO(gtk_widget_create_pango_layout, pFpp)
+GO(gtk_widget_destroy, vFp)
+GO(gtk_widget_destroyed, vFpp)
+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, iFv)
+GO(gtk_widget_freeze_child_notify, vFp)
+GO(gtk_widget_get_accessible, pFp)
+GO(gtk_widget_get_action, pFp)
+GO(gtk_widget_get_allocation, vFpp)
+GO(gtk_widget_get_allocated_width, iFp)
+GO(gtk_widget_get_allocated_height, iFp)
+GO(gtk_widget_get_ancestor, pFpi)
+GO(gtk_widget_get_app_paintable, iFp)
+GO(gtk_widget_get_can_default, iFp)
+GO(gtk_widget_get_can_focus, iFp)
+GO(gtk_widget_get_child_requisition, vFpp)
+GO(gtk_widget_get_child_visible, iFp)
+GO(gtk_widget_get_clipboard, pFpp)
+GO(gtk_widget_get_colormap, pFp)
+GO(gtk_widget_get_composite_name, pFp)
+GO(gtk_widget_get_default_colormap, pFv)
+GO(gtk_widget_get_default_direction, iFv)
+GO(gtk_widget_get_default_style, pFv)
+GO(gtk_widget_get_default_visual, pFv)
+GO(gtk_widget_get_direction, iFp)
+GO(gtk_widget_get_display, pFp)
+GO(gtk_widget_get_double_buffered, iFp)
+GO(gtk_widget_get_events, iFp)
+GO(gtk_widget_get_extension_events, iFp)
+GO(gtk_widget_get_frame_clock, pFp)
+GO(gtk_widget_get_halign, iFp)
+GO(gtk_widget_get_has_tooltip, iFp)
+GO(gtk_widget_get_has_window, iFp)
+GO(gtk_widget_get_hexpand, iFp)
+GO(gtk_widget_get_hexpand_set, iFp)
+GO(gtk_widget_get_margin_bottom, iFp)
+GO(gtk_widget_get_margin_end, iFp)
+GO(gtk_widget_get_margin_left, iFp)
+GO(gtk_widget_get_margin_right, iFp)
+GO(gtk_widget_get_margin_start, iFp)
+GO(gtk_widget_get_margin_top, iFp)
+GO(gtk_widget_get_mapped, iFp)
+GO(gtk_widget_get_modifier_style, pFp)
+GO(gtk_widget_get_name, pFp)
+GO(gtk_widget_get_no_show_all, iFp)
+GO(gtk_widget_get_pango_context, pFp)
+GO(gtk_widget_get_parent, pFp)
+GO(gtk_widget_get_parent_window, pFp)
+GO(gtk_widget_get_pointer, vFppp)
+GO(gtk_widget_get_preferred_height, vFppp)
+GO(gtk_widget_get_preferred_height_and_baseline_for_width, vFpipppp)
+GO(gtk_widget_get_preferred_height_for_width, vFpipp)
+GO(gtk_widget_get_preferred_size, vFppp)
+GO(gtk_widget_get_preferred_width, vFppp)
+GO(gtk_widget_get_preferred_width_for_height, vFpipp)
+GO(gtk_widget_get_realized, iFp)
+GO(gtk_widget_get_receives_default, iFp)
+GO(gtk_widget_get_request_mode, iFp)
+GO(gtk_widget_get_requisition, vFpp)
+GO(gtk_widget_get_root_window, pFp)
+GO(gtk_widget_get_scale_factor, iFp)
+GO(gtk_widget_get_screen, pFp)
+GO(gtk_widget_get_sensitive, iFp)
+GO(gtk_widget_get_settings, pFp)
+GO(gtk_widget_get_size_request, vFppp)
+GO(gtk_widget_get_snapshot, pFpp)
+GO(gtk_widget_get_state, iFp)
+GO(gtk_widget_get_style, pFp)
+GO(gtk_widget_get_template_child, pFpip)
+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, iFv)
+GO(gtk_widget_get_valign, iFp)
+GO(gtk_widget_get_valign_with_baseline, iFp)
+GO(gtk_widget_get_vexpand, iFp)
+GO(gtk_widget_get_vexpand_set, iFp)
+GO(gtk_widget_get_visible, iFp)
+GO(gtk_widget_get_visual, pFp)
+GO(gtk_widget_get_window, pFp)
+GO(gtk_widget_grab_default, vFp)
+GO(gtk_widget_grab_focus, vFp)
+GO(gtk_widget_has_default, iFp)
+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, iFv)
+GO(gtk_widget_hide, vFp)
+GO(gtk_widget_hide_all, vFp)
+GO(gtk_widget_hide_on_delete, iFp)
+GO(gtk_widget_init_template, vFp)
+GO(gtk_widget_input_shape_combine_mask, vFppii)
+GO(gtk_widget_intersect, iFppp)
+GO(gtk_widget_is_ancestor, iFpp)
+GO(gtk_widget_is_composited, iFp)
+GO(gtk_widget_is_drawable, iFp)
+GO(gtk_widget_is_focus, iFp)
+GO(gtk_widget_is_sensitive, iFp)
+GO(gtk_widget_is_toplevel, iFp)
+GO(gtk_widget_keynav_failed, iFpi)
+GO(gtk_widget_list_accel_closures, pFp)
+GO(gtk_widget_list_mnemonic_labels, pFp)
+GO(gtk_widget_map, vFp)
+GO(gtk_widget_mnemonic_activate, iFpi)
+GO(gtk_widget_modify_base, vFpip)
+GO(gtk_widget_modify_bg, vFpip)
+GO(gtk_widget_modify_cursor, vFppp)
+GO(gtk_widget_modify_fg, vFpip)
+GO(gtk_widget_modify_font, vFpp)
+GO(gtk_widget_modify_style, vFpp)
+GO(gtk_widget_modify_text, vFpip)
+GO(gtk_widget_new, pFppppppppppppp) //vaarg
+GO(gtk_widget_path, vFpppp)
+GO(gtk_widget_path_append_type, iFpp)
+GO(gtk_widget_path_append_with_siblings, iFppu)
+GO(gtk_widget_path_append_for_widget, iFpp)
+GO(gtk_widget_path_copy, pFp)
+GO(gtk_widget_path_free, vFp)
+GO(gtk_widget_path_get_object_type, pFp)
+GO(gtk_widget_path_has_parent, iFpp)
+GO(gtk_widget_path_is_type, iFpp)
+GO(gtk_widget_path_iter_add_class, vFpip)
+GO(gtk_widget_path_iter_add_region, vFpipi)
+GO(gtk_widget_path_iter_clear_classes, vFpi)
+GO(gtk_widget_path_iter_clear_regions, vFpi)
+GO(gtk_widget_path_iter_get_name, pFpi)
+GO(gtk_widget_path_iter_get_object_name, pFpi)
+GO(gtk_widget_path_iter_get_object_type, pFpi)
+GO(gtk_widget_path_iter_get_siblings, pFpi)
+GO(gtk_widget_path_iter_get_sibling_index, uFpi)
+GO(gtk_widget_path_iter_get_state, iFpi)
+GO(gtk_widget_path_iter_has_class, iFpip)
+GO(gtk_widget_path_iter_has_name, iFpip)
+GO(gtk_widget_path_iter_has_qclass, iFpip)
+GO(gtk_widget_path_iter_has_qname, iFpip)
+GO(gtk_widget_path_iter_has_qregion, iFpipp)
+GO(gtk_widget_path_iter_has_region, iFpipp)
+GO(gtk_widget_path_iter_list_classes, pFpi)
+GO(gtk_widget_path_iter_list_regions, pFpi)
+GO(gtk_widget_path_iter_remove_class, vFpip)
+GO(gtk_widget_path_iter_remove_region, vFpip)
+GO(gtk_widget_path_iter_set_name, vFpip)
+GO(gtk_widget_path_iter_set_object_name, vFpip)
+GO(gtk_widget_path_iter_set_object_type, vFpip)
+GO(gtk_widget_path_iter_set_state, vFpii)
+GO(gtk_widget_path_length, iFp)
+GO(gtk_widget_path_new, pFv)
+GO(gtk_widget_path_prepend_type, vFpp)
+GO(gtk_widget_path_to_string, pFp)
+GO(gtk_widget_path_ref, pFp)
+GO(gtk_widget_path_unref, vFp)
+GO(gtk_widget_pop_colormap, vFv)
+GO(gtk_widget_pop_composite_child, vFv)
+GO(gtk_widget_push_colormap, vFp)
+GO(gtk_widget_push_composite_child, vFv)
+GO(gtk_widget_queue_clear, vFp)
+GO(gtk_widget_queue_clear_area, vFpiiii)
+GO(gtk_widget_queue_draw, vFp)
+GO(gtk_widget_queue_draw_area, vFpiiii)
+GO(gtk_widget_queue_resize, vFp)
+GO(gtk_widget_queue_resize_no_redraw, vFp)
+GO(gtk_widget_realize, vFp)
+GO(gtk_widget_ref, pFp)
+GO(gtk_widget_region_intersect, pFpp)
+GO(gtk_widget_remove_accelerator, iFppui)
+GO(gtk_widget_remove_mnemonic_label, vFpp)
+GO(gtk_widget_render_icon, pFppip)
+GO(gtk_widget_reparent, vFpp)
+GO(gtk_widget_reset_rc_styles, vFp)
+GO(gtk_widget_reset_shapes, vFp)
+GO(gtk_widget_send_expose, iFpp)
+GO(gtk_widget_send_focus_change, iFpp)
+GO(gtk_widget_set, vFppppppppppppppp) //vaarg
+GO(gtk_widget_set_accel_path, vFppp)
+GO(gtk_widget_set_allocation, vFpp)
+GO(gtk_widget_set_app_paintable, vFpi)
+GO(gtk_widget_set_can_default, vFpi)
+GO(gtk_widget_set_can_focus, vFpi)
+GO(gtk_widget_set_child_visible, vFpi)
+GO(gtk_widget_set_colormap, vFpp)
+GO(gtk_widget_set_composite_name, vFpp)
+GO(gtk_widget_set_default_colormap, vFp)
+GO(gtk_widget_set_default_direction, vFi)
+GO(gtk_widget_set_direction, vFpi)
+GO(gtk_widget_set_double_buffered, vFpi)
+GO(gtk_widget_set_events, vFpi)
+GO(gtk_widget_set_extension_events, vFpi)
+GO(gtk_widget_set_halign, vFpi)
+GO(gtk_widget_set_has_tooltip, vFpi)
+GO(gtk_widget_set_has_window, vFpi)
+GO(gtk_widget_set_hexpand, vFpi)
+GO(gtk_widget_set_hexpand_set, vFpi)
+GO(gtk_widget_set_mapped, vFpi)
+GO(gtk_widget_set_margin_bottom, vFpi)
+GO(gtk_widget_set_margin_end, vFpi)
+GO(gtk_widget_set_margin_left, vFpi)
+GO(gtk_widget_set_margin_right, vFpi)
+GO(gtk_widget_set_margin_start, vFpi)
+GO(gtk_widget_set_margin_top, vFpi)
+GO(gtk_widget_set_name, vFpp)
+GO(gtk_widget_set_no_show_all, vFpi)
+GO(gtk_widget_set_parent, vFpp)
+GO(gtk_widget_set_parent_window, vFpp)
+GO(gtk_widget_queue_compute_expand, vFp)
+GO(gtk_widget_set_realized, vFpi)
+GO(gtk_widget_set_receives_default, vFpi)
+GO(gtk_widget_set_redraw_on_allocate, vFpi)
+GO(gtk_widget_set_scroll_adjustments, iFppp)
+GO(gtk_widget_set_sensitive, vFpi)
+GO(gtk_widget_set_size_request, vFpii)
+GO(gtk_widget_set_state, vFpi)
+GO(gtk_widget_set_style, vFpp)
+GO(gtk_widget_class_set_template, vFpp)
+GO(gtk_widget_class_set_template_from_resource, vFpp)
+GO(gtk_widget_set_tooltip_markup, vFpp)
+GO(gtk_widget_set_tooltip_text, vFpp)
+GO(gtk_widget_set_tooltip_window, vFpp)
+GO(gtk_widget_set_uposition, vFpii)
+GO(gtk_widget_set_usize, vFpii)
+GO(gtk_widget_set_valign, vFpi)
+GO(gtk_widget_set_vexpand, vFpi)
+GO(gtk_widget_set_vexpand_set, vFpi)
+GO(gtk_widget_set_visible, vFpi)
+GO(gtk_widget_set_window, vFpp)
+GO(gtk_widget_shape_combine_mask, vFppii)
+GO(gtk_widget_show, vFp)
+GO(gtk_widget_show_all, vFp)
+GO(gtk_widget_show_now, vFp)
+GO(gtk_widget_size_allocate, vFpppuii)
+GO(gtk_widget_size_request, vFpp)
+GO(gtk_widget_style_attach, vFp)
+//GO2(gtk_widget_style_get, vFppV, gtk_widget_style_get_valist)
+GO(gtk_widget_style_get_property, vFppp)
+//GO(gtk_widget_style_get_valist, vFppp)
+GO(gtk_widget_thaw_child_notify, vFp)
+GO(gtk_widget_translate_coordinates, iFppiipp)
+GO(gtk_widget_trigger_tooltip_query, vFp)
+GO(gtk_widget_unmap, vFp)
+GO(gtk_widget_unparent, vFp)
+GO(gtk_widget_unrealize, vFp)
+GO(gtk_widget_unref, vFp)
+GO(gtk_window_activate_default, iFp)
+GO(gtk_window_activate_focus, iFp)
+GO(gtk_window_activate_key, iFpp)
+GO(gtk_window_add_accel_group, vFpp)
+GO(gtk_window_add_embedded_xid, vFpu)
+GO(gtk_window_add_mnemonic, vFpup)
+GO(gtk_window_begin_move_drag, vFpiiiu)
+GO(gtk_window_begin_resize_drag, vFpuiiiu)
+GO(gtk_window_deiconify, vFp)
+GO(gtk_window_fullscreen, vFp)
+GO(gtk_window_get_accept_focus, iFp)
+GO(gtk_window_get_decorated, iFp)
+GO(gtk_window_get_default_icon_list, pFv)
+GO(gtk_window_get_default_icon_name, pFv)
+GO(gtk_window_get_default_size, vFppp)
+GO(gtk_window_get_default_widget, pFp)
+GO(gtk_window_get_deletable, iFp)
+GO(gtk_window_get_destroy_with_parent, iFp)
+GO(gtk_window_get_focus, pFp)
+GO(gtk_window_get_focus_on_map, iFp)
+GO(gtk_window_get_frame_dimensions, vFppppp)
+GO(gtk_window_get_gravity, iFp)
+GO(gtk_window_get_group, pFp)
+GO(gtk_window_get_has_frame, iFp)
+GO(gtk_window_get_icon, pFp)
+GO(gtk_window_get_icon_list, pFp)
+GO(gtk_window_get_icon_name, pFp)
+GO(gtk_window_get_mnemonic_modifier, iFp)
+GO(gtk_window_get_mnemonics_visible, iFp)
+GO(gtk_window_get_modal, iFp)
+GO(gtk_window_get_opacity, dFp)
+GO(gtk_window_get_position, vFppp)
+GO(gtk_window_get_resizable, iFp)
+GO(gtk_window_get_role, pFp)
+GO(gtk_window_get_screen, pFp)
+GO(gtk_window_get_size, vFppp)
+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, iFv)
+GO(gtk_window_get_type_hint, iFp)
+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, iFv)
+GO(gtk_window_group_list_windows, pFp)
+GO(gtk_window_group_new, pFv)
+GO(gtk_window_group_remove_window, vFpp)
+GO(gtk_window_has_group, iFp)
+GO(gtk_window_has_toplevel_focus, iFp)
+GO(gtk_window_iconify, vFp)
+GO(gtk_window_is_active, iFp)
+GO(gtk_window_list_toplevels, pFv)
+GO(gtk_window_maximize, vFp)
+GO(gtk_window_mnemonic_activate, iFpui)
+GO(gtk_window_move, vFpii)
+GO(gtk_window_new, pFi)
+GO(gtk_window_parse_geometry, iFpp)
+GO(gtk_window_position_get_type, iFv)
+GO(gtk_window_present, vFp)
+GO(gtk_window_present_with_time, vFpu)
+GO(gtk_window_propagate_key_event, iFpp)
+GO(gtk_window_remove_accel_group, vFpp)
+GO(gtk_window_remove_embedded_xid, vFpu)
+GO(gtk_window_remove_mnemonic, vFpup)
+GO(gtk_window_reshow_with_initial_size, vFp)
+GO(gtk_window_resize, vFpii)
+GO(gtk_window_set_accept_focus, vFpi)
+GO(gtk_window_set_auto_startup_notification, vFi)
+GO(gtk_window_set_decorated, vFpi)
+GO(gtk_window_set_default, vFpp)
+GO(gtk_window_set_default_icon, vFp)
+GO(gtk_window_set_default_icon_from_file, iFpp)
+GO(gtk_window_set_default_icon_list, vFp)
+GO(gtk_window_set_default_icon_name, vFp)
+GO(gtk_window_set_default_size, vFpii)
+GO(gtk_window_set_deletable, vFpi)
+GO(gtk_window_set_destroy_with_parent, vFpi)
+GO(gtk_window_set_focus, vFpp)
+GO(gtk_window_set_focus_on_map, vFpi)
+GO(gtk_window_set_frame_dimensions, vFpiiii)
+GO(gtk_window_set_geometry_hints, vFpppi)
+GO(gtk_window_set_gravity, vFpi)
+GO(gtk_window_set_has_frame, vFpi)
+GO(gtk_window_set_icon, vFpp)
+GO(gtk_window_set_icon_from_file, iFppp)
+GO(gtk_window_set_icon_list, vFpp)
+GO(gtk_window_set_icon_name, vFpp)
+GO(gtk_window_set_keep_above, vFpi)
+GO(gtk_window_set_keep_below, vFpi)
+GO(gtk_window_set_mnemonic_modifier, vFpi)
+GO(gtk_window_set_mnemonics_visible, vFpi)
+GO(gtk_window_set_modal, vFpi)
+GO(gtk_window_set_opacity, vFpd)
+GO(gtk_window_set_policy, vFpiii)
+GO(gtk_window_set_position, vFpi)
+GO(gtk_window_set_resizable, vFpi)
+GO(gtk_window_set_role, vFpp)
+GO(gtk_window_set_screen, vFpp)
+GO(gtk_window_set_skip_pager_hint, vFpi)
+GO(gtk_window_set_skip_taskbar_hint, vFpi)
+GO(gtk_window_set_startup_id, vFpp)
+GO(gtk_window_set_title, vFpp)
+GO(gtk_window_set_transient_for, vFpp)
+GO(gtk_window_set_type_hint, vFpi)
+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, iFv)
+GO(gtk_window_unfullscreen, vFp)
+GO(gtk_window_unmaximize, vFp)
+GO(gtk_window_unstick, vFp)
+GO(gtk_wrap_mode_get_type, iFv)
diff --git a/src/wrapped/wrappedgtkx112.c b/src/wrapped/wrappedgtkx112.c
index e732f524..f787d156 100755
--- a/src/wrapped/wrappedgtkx112.c
+++ b/src/wrapped/wrappedgtkx112.c
@@ -1107,27 +1107,27 @@ EXPORT void* my_gtk_link_button_set_uri_hook(x64emu_t* emu, void* f, void* data,
     libname = lib->name;                                                        \
     getMy(lib);                                                                 \
     SetGtkObjectID(my->gtk_object_get_type());                                  \
-    SetGtkWidgetID(my->gtk_widget_get_type());                                  \
-    SetGtkContainerID(my->gtk_container_get_type());                            \
+    SetGtkWidget2ID(my->gtk_widget_get_type());                                 \
+    SetGtkContainer2ID(my->gtk_container_get_type());                           \
     SetGtkActionID(my->gtk_action_get_type());                                  \
-    SetGtkMiscID(my->gtk_misc_get_type());                                      \
-    SetGtkLabelID(my->gtk_label_get_type());                                    \
-    SetGtkTreeViewID(my->gtk_tree_view_get_type());                             \
-    SetGtkBinID(my->gtk_bin_get_type());                                        \
-    SetGtkWindowID(my->gtk_window_get_type());                                  \
-    SetGtkTableID(my->gtk_table_get_type());                                    \
-    SetGtkFixedID(my->gtk_fixed_get_type());                                    \
-    SetGtkButtonID(my->gtk_button_get_type());                                  \
-    SetGtkComboBoxID(my->gtk_combo_box_get_type());                             \
-    SetGtkToggleButtonID(my->gtk_toggle_button_get_type());                     \
-    SetGtkCheckButtonID(my->gtk_check_button_get_type());                       \
-    SetGtkEntryID(my->gtk_entry_get_type());                                    \
-    SetGtkSpinButtonID(my->gtk_spin_button_get_type());                         \
-    SetGtkProgressID(my->gtk_progress_get_type());                              \
-    SetGtkProgressBarID(my->gtk_progress_bar_get_type());                       \
-    SetGtkFrameID(my->gtk_frame_get_type());                                    \
-    SetGtkMenuShellID(my->gtk_menu_shell_get_type());                           \
-    SetGtkMenuBarID(my->gtk_menu_bar_get_type());                               \
+    SetGtkMisc2ID(my->gtk_misc_get_type());                                     \
+    SetGtkLabel2ID(my->gtk_label_get_type());                                   \
+    SetGtkTreeView2ID(my->gtk_tree_view_get_type());                            \
+    SetGtkBin2ID(my->gtk_bin_get_type());                                       \
+    SetGtkWindow2ID(my->gtk_window_get_type());                                 \
+    SetGtkTable2ID(my->gtk_table_get_type());                                   \
+    SetGtkFixed2ID(my->gtk_fixed_get_type());                                   \
+    SetGtkButton2ID(my->gtk_button_get_type());                                 \
+    SetGtkComboBox2ID(my->gtk_combo_box_get_type());                            \
+    SetGtkToggleButton2ID(my->gtk_toggle_button_get_type());                    \
+    SetGtkCheckButton2ID(my->gtk_check_button_get_type());                      \
+    SetGtkEntry2ID(my->gtk_entry_get_type());                                   \
+    SetGtkSpinButton2ID(my->gtk_spin_button_get_type());                        \
+    SetGtkProgress2ID(my->gtk_progress_get_type());                             \
+    SetGtkProgressBar2ID(my->gtk_progress_bar_get_type());                      \
+    SetGtkFrame2ID(my->gtk_frame_get_type());                                   \
+    SetGtkMenuShell2ID(my->gtk_menu_shell_get_type());                          \
+    SetGtkMenuBar2ID(my->gtk_menu_bar_get_type());                              \
     setNeededLibs(lib, 2, "libgdk-x11-2.0.so.0", "libpangocairo-1.0.so.0");
 
 #define CUSTOM_FINI \