New upstream version 18.4

1 files changed, 461 insertions, 461 deletions

diff --git a/tools/xgdata.scm b/tools/xgdata.scm
index 958a65d..6107626 100644
--- a/tools/xgdata.scm
+++ b/tools/xgdata.scm
@@ -6859,29 +6859,29 @@
 
 
 ;;; for 2.13.0, mostly deprecated in 3.19
-(CINT-2.14 "GTK_CALENDAR_SHOW_DETAILS" "GtkCalendarDisplayOptions")
-(CFNC-2.14 "void gtk_calendar_set_detail_func GtkCalendar* calendar GtkCalendarDetailFunc func lambda_data @func_info GDestroyNotify destroy")
-(CFNC-2.14 "void gtk_calendar_set_detail_width_chars GtkCalendar* calendar gint chars")
-(CFNC-2.14 "void gtk_calendar_set_detail_height_rows GtkCalendar* calendar gint rows")
-(CFNC-2.14 "gint gtk_calendar_get_detail_width_chars GtkCalendar* calendar")
-(CFNC-2.14 "gint gtk_calendar_get_detail_height_rows GtkCalendar* calendar")
-;;; 3.22.2 (CFNC-2.14 "gint gdk_screen_get_monitor_width_mm GdkScreen* screen gint monitor_num")
-;;; 3.22.2 (CFNC-2.14 "gint gdk_screen_get_monitor_height_mm GdkScreen* screen gint monitor_num")
-;;; 3.22.2 (CFNC-2.14 "gchar* gdk_screen_get_monitor_plug_name GdkScreen* screen gint monitor_num")
-;;; (CFNC-2.14 "void gtk_tooltip_set_icon_from_icon_name GtkTooltip* tooltip gchar* icon_name GtkIconSize size" 'const)
-
-;(CFNC-2.14 "void gtk_test_init int* argcp char*** argvp ...")
-;(CFNC-2.14 "GtkWidget* gtk_test_find_widget GtkWidget* widget gchar* label_pattern GType widget_type" 'const)
-;(CFNC-2.14 "GtkWidget* gtk_test_create_widget GType widget_type gchar* first_property_name ..." 'const)
-;(CFNC-2.14 "GtkWidget* gtk_test_create_simple_window gchar* window_title gchar* dialog_text" 'const)
-;(CFNC-2.14 "GtkWidget* gtk_test_display_button_window gchar* window_title gchar* dialog_text ..." 'const)
-;(CFNC-2.14 "void gtk_test_slider_set_perc GtkWidget* widget double percentage")
-;(CFNC-2.14 "double gtk_test_slider_get_value GtkWidget* widget")
-;(CFNC-2.14 "gboolean gtk_test_spin_button_click GtkSpinButton* widget guint button gboolean upwards")
-;(CFNC-2.14 "gboolean gtk_test_widget_click GtkWidget* widget guint button GdkModifierType modifiers")
-;(CFNC-2.14 "gboolean gtk_test_widget_send_key GtkWidget* widget guint keyval GdkModifierType modifiers")
-;(CFNC-2.14 "void gtk_test_text_set GtkWidget* widget gchar* string" 'const)
-;(CFNC-2.14 "gchar* gtk_test_text_get GtkWidget* widget")
+(CINT "GTK_CALENDAR_SHOW_DETAILS" "GtkCalendarDisplayOptions")
+(CFNC "void gtk_calendar_set_detail_func GtkCalendar* calendar GtkCalendarDetailFunc func lambda_data @func_info GDestroyNotify destroy")
+(CFNC "void gtk_calendar_set_detail_width_chars GtkCalendar* calendar gint chars")
+(CFNC "void gtk_calendar_set_detail_height_rows GtkCalendar* calendar gint rows")
+(CFNC "gint gtk_calendar_get_detail_width_chars GtkCalendar* calendar")
+(CFNC "gint gtk_calendar_get_detail_height_rows GtkCalendar* calendar")
+;;; 3.22.2 (CFNC "gint gdk_screen_get_monitor_width_mm GdkScreen* screen gint monitor_num")
+;;; 3.22.2 (CFNC "gint gdk_screen_get_monitor_height_mm GdkScreen* screen gint monitor_num")
+;;; 3.22.2 (CFNC "gchar* gdk_screen_get_monitor_plug_name GdkScreen* screen gint monitor_num")
+;;; (CFNC "void gtk_tooltip_set_icon_from_icon_name GtkTooltip* tooltip gchar* icon_name GtkIconSize size" 'const)
+
+;(CFNC "void gtk_test_init int* argcp char*** argvp ...")
+;(CFNC "GtkWidget* gtk_test_find_widget GtkWidget* widget gchar* label_pattern GType widget_type" 'const)
+;(CFNC "GtkWidget* gtk_test_create_widget GType widget_type gchar* first_property_name ..." 'const)
+;(CFNC "GtkWidget* gtk_test_create_simple_window gchar* window_title gchar* dialog_text" 'const)
+;(CFNC "GtkWidget* gtk_test_display_button_window gchar* window_title gchar* dialog_text ..." 'const)
+;(CFNC "void gtk_test_slider_set_perc GtkWidget* widget double percentage")
+;(CFNC "double gtk_test_slider_get_value GtkWidget* widget")
+;(CFNC "gboolean gtk_test_spin_button_click GtkSpinButton* widget guint button gboolean upwards")
+;(CFNC "gboolean gtk_test_widget_click GtkWidget* widget guint button GdkModifierType modifiers")
+;(CFNC "gboolean gtk_test_widget_send_key GtkWidget* widget guint keyval GdkModifierType modifiers")
+;(CFNC "void gtk_test_text_set GtkWidget* widget gchar* string" 'const)
+;(CFNC "gchar* gtk_test_text_get GtkWidget* widget")
 
 
 (CAIRO-FUNC "void cairo_path_extents cairo_t* cr double* [x1] double* [y1] double* [x2] double* [y2]")
@@ -6915,52 +6915,52 @@
 
 ;;; gtk 2.13.4
 
-(CFNC-2.14 "gboolean gtk_accel_group_get_is_locked GtkAccelGroup* accel_group")
-;;; 3.3.16 (CFNC-2.14 "GtkWidget* gtk_color_selection_dialog_get_color_selection GtkColorSelectionDialog* colorsel")
-;;; 3.90.0 (CFNC-2.14 "GtkWidget* gtk_container_get_focus_child GtkContainer* container")
-;;; 3.12? (CFNC-2.14 "GtkWidget* gtk_dialog_get_action_area GtkDialog* dialog")
-(CFNC-2.14 "GtkWidget* gtk_dialog_get_content_area GtkDialog* dialog")
-(CFNC-2.14 "void gtk_entry_set_overwrite_mode GtkEntry* entry gboolean overwrite")
-(CFNC-2.14 "gboolean gtk_entry_get_overwrite_mode GtkEntry* entry")
-(CFNC-2.14 "guint16 gtk_entry_get_text_length GtkEntry* entry")
-
-;;; out 2.13.7 (CFNC-2.14 "GtkWidget* gtk_font_selection_get_family_entry GtkFontSelection* fontsel")
-;;; 3.1.12 (CFNC-2.14 "GtkWidget* gtk_font_selection_get_family_list GtkFontSelection* fontsel")
-;;; out 2.13.7 (CFNC-2.14 "GtkWidget* gtk_font_selection_get_face_entry GtkFontSelection* fontsel")
-;;; 3.1.12 (CFNC-2.14 "GtkWidget* gtk_font_selection_get_face_list GtkFontSelection* fontsel")
-;;; 3.1.12 (CFNC-2.14 "GtkWidget* gtk_font_selection_get_size_entry GtkFontSelection* fontsel")
-;;; 3.1.12 (CFNC-2.14 "GtkWidget* gtk_font_selection_get_size_list GtkFontSelection* fontsel")
-;;; 3.1.12 (CFNC-2.14 "GtkWidget* gtk_font_selection_get_preview_entry GtkFontSelection* fontsel")
-;;; 3.1.12 (CFNC-2.14 "PangoFontFamily* gtk_font_selection_get_family GtkFontSelection* fontsel")
-;;; 3.1.12 (CFNC-2.14 "PangoFontFace* gtk_font_selection_get_face GtkFontSelection* fontsel")
-;;; 3.1.12 (CFNC-2.14 "gint gtk_font_selection_get_size GtkFontSelection* fontsel")
-;;; 3.1.12 (CFNC-2.14 "GtkWidget* gtk_font_selection_dialog_get_ok_button GtkFontSelectionDialog* fsd")
-;;; out 2.15.0 (CFNC-2.14 "GtkWidget* gtk_font_selection_dialog_get_apply_button GtkFontSelectionDialog* fsd")
-;;; 3.1.12 (CFNC-2.14 "GtkWidget* gtk_font_selection_dialog_get_cancel_button GtkFontSelectionDialog* fsd")
-
-;;; 3.3.2 (CFNC-2.14 "gboolean gtk_handle_box_get_child_detached GtkHandleBox* handle_box")
-;;; 3.91.2 (CFNC-2.14 "GdkWindow* gtk_layout_get_bin_window GtkLayout* layout")
-(CFNC-2.14 "gchar* gtk_menu_get_accel_path GtkMenu* menu" 'const)
-(CFNC-2.14 "gint gtk_menu_get_monitor GtkMenu* menu")
-(CFNC-2.14 "gchar* gtk_menu_item_get_accel_path GtkMenuItem* menu_item" 'const)
-;(CFNC-2.14 "GtkWidget* gtk_message_dialog_get_image GtkMessageDialog* dialog")
-;;; 2.99.3 (CFNC-2.14 "gboolean gtk_plug_get_embedded GtkPlug* plug")
-;;; 2.99.3 (CFNC-2.14 "GdkWindow* gtk_plug_get_socket_window GtkPlug* plug")
-;;; out 2.15.1 (CFNC-2.14 "GtkOrientation gtk_scale_button_get_orientation GtkScaleButton* button")
-;;; (CFNC-2.14 "void gtk_scale_button_set_orientation GtkScaleButton* button GtkOrientation orientation")
-(CFNC-2.14 "GtkWidget* gtk_scale_button_get_plus_button GtkScaleButton* button")
-(CFNC-2.14 "GtkWidget* gtk_scale_button_get_minus_button GtkScaleButton* button")
-(CFNC-2.14 "GtkWidget* gtk_scale_button_get_popup GtkScaleButton* button")
-(CFNC-2.14 "GdkAtom gtk_selection_data_get_target GtkSelectionData* selection_data")
-(CFNC-2.14 "GdkAtom gtk_selection_data_get_data_type GtkSelectionData* selection_data")
-(CFNC-2.14 "gint gtk_selection_data_get_format GtkSelectionData* selection_data")
-;;; changed 2.14.1 (CFNC-2.14 "guchar* gtk_selection_data_get_data GtkSelectionData* selection_data guint* length" 'const)
-(CFNC-2.14 "GdkDisplay* gtk_selection_data_get_display GtkSelectionData* selection_data")
-;;; 2.99.3 (CFNC-2.14 "GdkWindow* gtk_socket_get_plug_window GtkSocket* socket_")
-;;out 2.14.1 ;(CFNC-2.14 "GtkAllocation gtk_widget_get_allocation GtkWidget* widget")
-(CFNC-2.14 "GdkWindow* gtk_widget_get_window GtkWidget* widget")
-;;; (CFNC-2.14 "GtkWidget* gtk_window_get_default GtkWindow* window")
-(CFNC-2.14 "GdkModifierType gtk_accel_group_get_modifier_mask GtkAccelGroup* accel_group")
+(CFNC "gboolean gtk_accel_group_get_is_locked GtkAccelGroup* accel_group")
+;;; 3.3.16 (CFNC "GtkWidget* gtk_color_selection_dialog_get_color_selection GtkColorSelectionDialog* colorsel")
+;;; 3.90.0 (CFNC "GtkWidget* gtk_container_get_focus_child GtkContainer* container")
+;;; 3.12? (CFNC "GtkWidget* gtk_dialog_get_action_area GtkDialog* dialog")
+(CFNC "GtkWidget* gtk_dialog_get_content_area GtkDialog* dialog")
+(CFNC "void gtk_entry_set_overwrite_mode GtkEntry* entry gboolean overwrite")
+(CFNC "gboolean gtk_entry_get_overwrite_mode GtkEntry* entry")
+(CFNC "guint16 gtk_entry_get_text_length GtkEntry* entry")
+
+;;; out 2.13.7 (CFNC "GtkWidget* gtk_font_selection_get_family_entry GtkFontSelection* fontsel")
+;;; 3.1.12 (CFNC "GtkWidget* gtk_font_selection_get_family_list GtkFontSelection* fontsel")
+;;; out 2.13.7 (CFNC "GtkWidget* gtk_font_selection_get_face_entry GtkFontSelection* fontsel")
+;;; 3.1.12 (CFNC "GtkWidget* gtk_font_selection_get_face_list GtkFontSelection* fontsel")
+;;; 3.1.12 (CFNC "GtkWidget* gtk_font_selection_get_size_entry GtkFontSelection* fontsel")
+;;; 3.1.12 (CFNC "GtkWidget* gtk_font_selection_get_size_list GtkFontSelection* fontsel")
+;;; 3.1.12 (CFNC "GtkWidget* gtk_font_selection_get_preview_entry GtkFontSelection* fontsel")
+;;; 3.1.12 (CFNC "PangoFontFamily* gtk_font_selection_get_family GtkFontSelection* fontsel")
+;;; 3.1.12 (CFNC "PangoFontFace* gtk_font_selection_get_face GtkFontSelection* fontsel")
+;;; 3.1.12 (CFNC "gint gtk_font_selection_get_size GtkFontSelection* fontsel")
+;;; 3.1.12 (CFNC "GtkWidget* gtk_font_selection_dialog_get_ok_button GtkFontSelectionDialog* fsd")
+;;; out 2.15.0 (CFNC "GtkWidget* gtk_font_selection_dialog_get_apply_button GtkFontSelectionDialog* fsd")
+;;; 3.1.12 (CFNC "GtkWidget* gtk_font_selection_dialog_get_cancel_button GtkFontSelectionDialog* fsd")
+
+;;; 3.3.2 (CFNC "gboolean gtk_handle_box_get_child_detached GtkHandleBox* handle_box")
+;;; 3.91.2 (CFNC "GdkWindow* gtk_layout_get_bin_window GtkLayout* layout")
+(CFNC "gchar* gtk_menu_get_accel_path GtkMenu* menu" 'const)
+(CFNC "gint gtk_menu_get_monitor GtkMenu* menu")
+(CFNC "gchar* gtk_menu_item_get_accel_path GtkMenuItem* menu_item" 'const)
+;(CFNC "GtkWidget* gtk_message_dialog_get_image GtkMessageDialog* dialog")
+;;; 2.99.3 (CFNC "gboolean gtk_plug_get_embedded GtkPlug* plug")
+;;; 2.99.3 (CFNC "GdkWindow* gtk_plug_get_socket_window GtkPlug* plug")
+;;; out 2.15.1 (CFNC "GtkOrientation gtk_scale_button_get_orientation GtkScaleButton* button")
+;;; (CFNC "void gtk_scale_button_set_orientation GtkScaleButton* button GtkOrientation orientation")
+(CFNC "GtkWidget* gtk_scale_button_get_plus_button GtkScaleButton* button")
+(CFNC "GtkWidget* gtk_scale_button_get_minus_button GtkScaleButton* button")
+(CFNC "GtkWidget* gtk_scale_button_get_popup GtkScaleButton* button")
+(CFNC "GdkAtom gtk_selection_data_get_target GtkSelectionData* selection_data")
+(CFNC "GdkAtom gtk_selection_data_get_data_type GtkSelectionData* selection_data")
+(CFNC "gint gtk_selection_data_get_format GtkSelectionData* selection_data")
+;;; changed 2.14.1 (CFNC "guchar* gtk_selection_data_get_data GtkSelectionData* selection_data guint* length" 'const)
+(CFNC "GdkDisplay* gtk_selection_data_get_display GtkSelectionData* selection_data")
+;;; 2.99.3 (CFNC "GdkWindow* gtk_socket_get_plug_window GtkSocket* socket_")
+;;out 2.14.1 ;(CFNC "GtkAllocation gtk_widget_get_allocation GtkWidget* widget")
+(CFNC "GdkWindow* gtk_widget_get_window GtkWidget* widget")
+;;; (CFNC "GtkWidget* gtk_window_get_default GtkWindow* window")
+(CFNC "GdkModifierType gtk_accel_group_get_modifier_mask GtkAccelGroup* accel_group")
 
 
 ;;; 3.3.8 (STRUCT-make "GdkColor guint32 &pixel guint16 &red guint16 &green guint16 &blue")
@@ -6978,354 +6978,354 @@
 
 
 ;;; gtk 1.13.6
-(CINT-2.14 "GDK_CROSSING_GTK_GRAB" "GdkCrossingMode")
-(CINT-2.14 "GDK_CROSSING_GTK_UNGRAB" "GdkCrossingMode")
-(CINT-2.14 "GDK_CROSSING_STATE_CHANGED" "GdkCrossingMode")
-
-
-(CFNC-2.14 "guint gdk_threads_add_timeout_seconds_full gint priority guint interval GSourceFunc function lambda_data @func_info GDestroyNotify notify")
-(CFNC-2.14 "guint gdk_threads_add_timeout_seconds guint interval GSourceFunc function lambda_data @func_info")
-(CFNC-2.14 "gdouble gtk_adjustment_get_lower GtkAdjustment* adjustment")
-(CFNC-2.14 "void gtk_adjustment_set_lower GtkAdjustment* adjustment gdouble lower")
-(CFNC-2.14 "gdouble gtk_adjustment_get_upper GtkAdjustment* adjustment")
-(CFNC-2.14 "void gtk_adjustment_set_upper GtkAdjustment* adjustment gdouble upper")
-(CFNC-2.14 "gdouble gtk_adjustment_get_step_increment GtkAdjustment* adjustment")
-(CFNC-2.14 "void gtk_adjustment_set_step_increment GtkAdjustment* adjustment gdouble step_increment")
-(CFNC-2.14 "gdouble gtk_adjustment_get_page_increment GtkAdjustment* adjustment")
-(CFNC-2.14 "void gtk_adjustment_set_page_increment GtkAdjustment* adjustment gdouble page_increment")
-(CFNC-2.14 "gdouble gtk_adjustment_get_page_size GtkAdjustment* adjustment")
-(CFNC-2.14 "void gtk_adjustment_set_page_size GtkAdjustment* adjustment gdouble page_size")
-(CFNC-2.14 "void gtk_adjustment_configure GtkAdjustment* adjustment gdouble value gdouble lower gdouble upper gdouble step_increment gdouble page_increment gdouble page_size")
-(CFNC-2.14 "void gtk_combo_box_set_button_sensitivity GtkComboBox* combo_box GtkSensitivityType sensitivity")
-(CFNC-2.14 "GtkSensitivityType gtk_combo_box_get_button_sensitivity GtkComboBox* combo_box")
-(CFNC-2.14 "GFile* gtk_file_chooser_get_file GtkFileChooser* chooser")
-(CFNC-2.14 "gboolean gtk_file_chooser_set_file GtkFileChooser* chooser GFile* file GError** [error]")
-(CFNC-2.14 "gboolean gtk_file_chooser_select_file GtkFileChooser* chooser GFile* file GError** [error]")
-(CFNC-2.14 "void gtk_file_chooser_unselect_file GtkFileChooser* chooser GFile* file")
-(CFNC-2.14 "GSList* gtk_file_chooser_get_files GtkFileChooser* chooser")
-(CFNC-2.14 "gboolean gtk_file_chooser_set_current_folder_file GtkFileChooser* chooser GFile* file GError** [error]")
-(CFNC-2.14 "GFile* gtk_file_chooser_get_current_folder_file GtkFileChooser* chooser")
-(CFNC-2.14 "GFile* gtk_file_chooser_get_preview_file GtkFileChooser* chooser")
-
-(CFNC-2.14 "GtkWidget* gtk_window_get_default_widget GtkWindow* window")
+(CINT "GDK_CROSSING_GTK_GRAB" "GdkCrossingMode")
+(CINT "GDK_CROSSING_GTK_UNGRAB" "GdkCrossingMode")
+(CINT "GDK_CROSSING_STATE_CHANGED" "GdkCrossingMode")
+
+
+;(CFNC "guint gdk_threads_add_timeout_seconds_full gint priority guint interval GSourceFunc function lambda_data @func_info GDestroyNotify notify")
+;(CFNC "guint gdk_threads_add_timeout_seconds guint interval GSourceFunc function lambda_data @func_info")
+(CFNC "gdouble gtk_adjustment_get_lower GtkAdjustment* adjustment")
+(CFNC "void gtk_adjustment_set_lower GtkAdjustment* adjustment gdouble lower")
+(CFNC "gdouble gtk_adjustment_get_upper GtkAdjustment* adjustment")
+(CFNC "void gtk_adjustment_set_upper GtkAdjustment* adjustment gdouble upper")
+(CFNC "gdouble gtk_adjustment_get_step_increment GtkAdjustment* adjustment")
+(CFNC "void gtk_adjustment_set_step_increment GtkAdjustment* adjustment gdouble step_increment")
+(CFNC "gdouble gtk_adjustment_get_page_increment GtkAdjustment* adjustment")
+(CFNC "void gtk_adjustment_set_page_increment GtkAdjustment* adjustment gdouble page_increment")
+(CFNC "gdouble gtk_adjustment_get_page_size GtkAdjustment* adjustment")
+(CFNC "void gtk_adjustment_set_page_size GtkAdjustment* adjustment gdouble page_size")
+(CFNC "void gtk_adjustment_configure GtkAdjustment* adjustment gdouble value gdouble lower gdouble upper gdouble step_increment gdouble page_increment gdouble page_size")
+(CFNC "void gtk_combo_box_set_button_sensitivity GtkComboBox* combo_box GtkSensitivityType sensitivity")
+(CFNC "GtkSensitivityType gtk_combo_box_get_button_sensitivity GtkComboBox* combo_box")
+(CFNC "GFile* gtk_file_chooser_get_file GtkFileChooser* chooser")
+(CFNC "gboolean gtk_file_chooser_set_file GtkFileChooser* chooser GFile* file GError** [error]")
+(CFNC "gboolean gtk_file_chooser_select_file GtkFileChooser* chooser GFile* file GError** [error]")
+(CFNC "void gtk_file_chooser_unselect_file GtkFileChooser* chooser GFile* file")
+(CFNC "GSList* gtk_file_chooser_get_files GtkFileChooser* chooser")
+(CFNC "gboolean gtk_file_chooser_set_current_folder_file GtkFileChooser* chooser GFile* file GError** [error]")
+(CFNC "GFile* gtk_file_chooser_get_current_folder_file GtkFileChooser* chooser")
+(CFNC "GFile* gtk_file_chooser_get_preview_file GtkFileChooser* chooser")
+
+(CFNC "GtkWidget* gtk_window_get_default_widget GtkWindow* window")
 
 ;;; gtkdestroynotify -> gdestroynotify
 
-(CINT-2.16 "GTK_ENTRY_ICON_PRIMARY" "GtkEntryIconPosition")
-(CINT-2.16 "GTK_ENTRY_ICON_SECONDARY" "GtkEntryIconPosition")
-
-;;; 3.13.2 (CINT-2.16 "GTK_ARROWS_BOTH" "GtkArrowPlacement")
-;;; 3.13.2 (CINT-2.16 "GTK_ARROWS_START" "GtkArrowPlacement")
-;;; 3.13.2 (CINT-2.16 "GTK_ARROWS_END" "GtkArrowPlacement")
-
-(CFNC-2.16 "gboolean gtk_link_button_get_visited GtkLinkButton* link_button")
-(CFNC-2.16 "void gtk_link_button_set_visited GtkLinkButton* link_button bool visited")
-(CFNC-2.16 "gboolean gdk_keymap_get_caps_lock_state GdkKeymap* keymap")
-(CFNC-2.16 "GtkTreeModel* gtk_cell_view_get_model GtkCellView* cell_view")
-(CFNC-2.16 "void gtk_entry_unset_invisible_char GtkEntry* entry")
-(CFNC-2.16 "void gtk_entry_set_progress_fraction GtkEntry* entry gdouble fraction")
-(CFNC-2.16 "gdouble gtk_entry_get_progress_fraction GtkEntry* entry")
-(CFNC-2.16 "void gtk_entry_set_progress_pulse_step GtkEntry* entry gdouble fraction")
-(CFNC-2.16 "gdouble gtk_entry_get_progress_pulse_step GtkEntry* entry")
-(CFNC-2.16 "void gtk_entry_progress_pulse GtkEntry* entry")
-;;; 3.93.0 (CFNC-2.16 "void gtk_entry_set_icon_from_pixbuf GtkEntry* entry GtkEntryIconPosition icon_pos GdkPixbuf* pixbuf")
-;;; 3.9.8 (CFNC-2.16 "void gtk_entry_set_icon_from_stock GtkEntry* entry GtkEntryIconPosition icon_pos gchar* stock_id")
-;;; 3.93.0 (CFNC-2.16 "void gtk_entry_set_icon_from_icon_name GtkEntry* entry GtkEntryIconPosition icon_pos gchar* icon_name")
-;;; 3.93.0 (CFNC-2.16 "void gtk_entry_set_icon_from_gicon GtkEntry* entry GtkEntryIconPosition icon_pos GIcon* icon")
-;??? (CFNC-2.16 "GtkImageType gtk_entry_get_storage_type GtkEntry* entry GtkEntryIconPosition icon_pos")
-;??? (CFNC-2.16 "GdkPixbuf* gtk_entry_get_pixbuf GtkEntry* entry GtkEntryIconPosition icon_pos")
-;??? (CFNC-2.16 "gchar* gtk_entry_get_stock GtkEntry* entry GtkEntryIconPosition icon_pos" 'const)
-(CFNC-2.16 "gchar* gtk_entry_get_icon_name GtkEntry* entry GtkEntryIconPosition icon_pos" 'const)
-;??? (CFNC-2.16 "GIcon* gtk_entry_get_gicon GtkEntry* entry GtkEntryIconPosition icon_pos")
-(CFNC-2.16 "void gtk_entry_set_icon_activatable GtkEntry* entry GtkEntryIconPosition icon_pos gboolean activatable")
-(CFNC-2.16 "gboolean gtk_entry_get_icon_activatable GtkEntry* entry GtkEntryIconPosition icon_pos")
-(CFNC-2.16 "void gtk_entry_set_icon_sensitive GtkEntry* entry GtkEntryIconPosition icon_pos gboolean sensitive")
-(CFNC-2.16 "gboolean gtk_entry_get_icon_sensitive GtkEntry* entry GtkEntryIconPosition icon_pos")
-(CFNC-2.16 "gint gtk_entry_get_icon_at_pos GtkEntry* entry gint x gint y")
-(CFNC-2.16 "void gtk_entry_set_icon_tooltip_text GtkEntry* entry GtkEntryIconPosition icon_pos gchar* tooltip")
-(CFNC-2.16 "void gtk_entry_set_icon_tooltip_markup GtkEntry* entry GtkEntryIconPosition icon_pos gchar* tooltip")
-;;; 3.93.0 (CFNC-2.16 "void gtk_entry_set_icon_drag_source GtkEntry* entry GtkEntryIconPosition icon_pos GtkTargetList* target_list GdkDragAction actions")
-;;; 3.93.0 (CFNC-2.16 "gint gtk_entry_get_current_icon_drag_source GtkEntry* entry")
-;;; (CFNC-2.16 "void gtk_image_menu_item_set_use_stock GtkImageMenuItem* image_menu_item gboolean use_stock")
-;;; (CFNC-2.16 "gboolean gtk_image_menu_item_get_use_stock GtkImageMenuItem* image_menu_item")
-;;; (CFNC-2.16 "void gtk_image_menu_item_set_accel_group GtkImageMenuItem* image_menu_item GtkAccelGroup* accel_group")
-(CFNC-2.16 "void gtk_menu_item_set_label GtkMenuItem* menu_item gchar* label")
-(CFNC-2.16 "gchar* gtk_menu_item_get_label GtkMenuItem* menu_item" 'const)
-(CFNC-2.16 "void gtk_menu_item_set_use_underline GtkMenuItem* menu_item gboolean setting")
-(CFNC-2.16 "gboolean gtk_menu_item_get_use_underline GtkMenuItem* menu_item")
-;;; 3.93.0 (CFNC-2.16 "GdkAtom gtk_selection_data_get_selection GtkSelectionData* selection_data")
+(CINT "GTK_ENTRY_ICON_PRIMARY" "GtkEntryIconPosition")
+(CINT "GTK_ENTRY_ICON_SECONDARY" "GtkEntryIconPosition")
+
+;;; 3.13.2 (CINT "GTK_ARROWS_BOTH" "GtkArrowPlacement")
+;;; 3.13.2 (CINT "GTK_ARROWS_START" "GtkArrowPlacement")
+;;; 3.13.2 (CINT "GTK_ARROWS_END" "GtkArrowPlacement")
+
+(CFNC "gboolean gtk_link_button_get_visited GtkLinkButton* link_button")
+(CFNC "void gtk_link_button_set_visited GtkLinkButton* link_button bool visited")
+(CFNC "gboolean gdk_keymap_get_caps_lock_state GdkKeymap* keymap")
+(CFNC "GtkTreeModel* gtk_cell_view_get_model GtkCellView* cell_view")
+(CFNC "void gtk_entry_unset_invisible_char GtkEntry* entry")
+(CFNC "void gtk_entry_set_progress_fraction GtkEntry* entry gdouble fraction")
+(CFNC "gdouble gtk_entry_get_progress_fraction GtkEntry* entry")
+(CFNC "void gtk_entry_set_progress_pulse_step GtkEntry* entry gdouble fraction")
+(CFNC "gdouble gtk_entry_get_progress_pulse_step GtkEntry* entry")
+(CFNC "void gtk_entry_progress_pulse GtkEntry* entry")
+;;; 3.93.0 (CFNC "void gtk_entry_set_icon_from_pixbuf GtkEntry* entry GtkEntryIconPosition icon_pos GdkPixbuf* pixbuf")
+;;; 3.9.8 (CFNC "void gtk_entry_set_icon_from_stock GtkEntry* entry GtkEntryIconPosition icon_pos gchar* stock_id")
+;;; 3.93.0 (CFNC "void gtk_entry_set_icon_from_icon_name GtkEntry* entry GtkEntryIconPosition icon_pos gchar* icon_name")
+;;; 3.93.0 (CFNC "void gtk_entry_set_icon_from_gicon GtkEntry* entry GtkEntryIconPosition icon_pos GIcon* icon")
+;??? (CFNC "GtkImageType gtk_entry_get_storage_type GtkEntry* entry GtkEntryIconPosition icon_pos")
+;??? (CFNC "GdkPixbuf* gtk_entry_get_pixbuf GtkEntry* entry GtkEntryIconPosition icon_pos")
+;??? (CFNC "gchar* gtk_entry_get_stock GtkEntry* entry GtkEntryIconPosition icon_pos" 'const)
+(CFNC "gchar* gtk_entry_get_icon_name GtkEntry* entry GtkEntryIconPosition icon_pos" 'const)
+;??? (CFNC "GIcon* gtk_entry_get_gicon GtkEntry* entry GtkEntryIconPosition icon_pos")
+(CFNC "void gtk_entry_set_icon_activatable GtkEntry* entry GtkEntryIconPosition icon_pos gboolean activatable")
+(CFNC "gboolean gtk_entry_get_icon_activatable GtkEntry* entry GtkEntryIconPosition icon_pos")
+(CFNC "void gtk_entry_set_icon_sensitive GtkEntry* entry GtkEntryIconPosition icon_pos gboolean sensitive")
+(CFNC "gboolean gtk_entry_get_icon_sensitive GtkEntry* entry GtkEntryIconPosition icon_pos")
+(CFNC "gint gtk_entry_get_icon_at_pos GtkEntry* entry gint x gint y")
+(CFNC "void gtk_entry_set_icon_tooltip_text GtkEntry* entry GtkEntryIconPosition icon_pos gchar* tooltip")
+(CFNC "void gtk_entry_set_icon_tooltip_markup GtkEntry* entry GtkEntryIconPosition icon_pos gchar* tooltip")
+;;; 3.93.0 (CFNC "void gtk_entry_set_icon_drag_source GtkEntry* entry GtkEntryIconPosition icon_pos GtkTargetList* target_list GdkDragAction actions")
+;;; 3.93.0 (CFNC "gint gtk_entry_get_current_icon_drag_source GtkEntry* entry")
+;;; (CFNC "void gtk_image_menu_item_set_use_stock GtkImageMenuItem* image_menu_item gboolean use_stock")
+;;; (CFNC "gboolean gtk_image_menu_item_get_use_stock GtkImageMenuItem* image_menu_item")
+;;; (CFNC "void gtk_image_menu_item_set_accel_group GtkImageMenuItem* image_menu_item GtkAccelGroup* accel_group")
+(CFNC "void gtk_menu_item_set_label GtkMenuItem* menu_item gchar* label")
+(CFNC "gchar* gtk_menu_item_get_label GtkMenuItem* menu_item" 'const)
+(CFNC "void gtk_menu_item_set_use_underline GtkMenuItem* menu_item gboolean setting")
+(CFNC "gboolean gtk_menu_item_get_use_underline GtkMenuItem* menu_item")
+;;; 3.93.0 (CFNC "GdkAtom gtk_selection_data_get_selection GtkSelectionData* selection_data")
 
 
 ;;; 2.15.1
-;;; 3.93.0 (CINT-2.16 "GDK_BLANK_CURSOR " "GdkCursorType")
-;;; (CSTR-2.16 "GTK_STOCK_CAPS_LOCK_WARNING")
+;;; 3.93.0 (CINT "GDK_BLANK_CURSOR " "GdkCursorType")
+;;; (CSTR "GTK_STOCK_CAPS_LOCK_WARNING")
 
 ;;; 3.9.8
-;;; (CFNC-2.16 "void gtk_action_set_label GtkAction* action gchar* label")
-;;; (CFNC-2.16 "gchar* gtk_action_get_label GtkAction* action")
-;;; (CFNC-2.16 "void gtk_action_set_short_label GtkAction* action gchar* short_label")
-;;; (CFNC-2.16 "gchar* gtk_action_get_short_label GtkAction* action")
-;;; (CFNC-2.16 "void gtk_action_set_tooltip GtkAction* action gchar* tooltip")
-;;; (CFNC-2.16 "gchar* gtk_action_get_tooltip GtkAction* action")
-;;; (CFNC-2.16 "void gtk_action_set_stock_id GtkAction* action gchar* stock_id")
-;;; (CFNC-2.16 "gchar* gtk_action_get_stock_id GtkAction* action")
-;;; (CFNC-2.16 "void gtk_action_set_gicon GtkAction* action GIcon* icon")
-;;; (CFNC-2.16 "GIcon* gtk_action_get_gicon GtkAction* action")
-;;; (CFNC-2.16 "void gtk_action_set_icon_name GtkAction* action gchar* icon_name")
-;;; (CFNC-2.16 "gchar* gtk_action_get_icon_name GtkAction* action")
-;;; (CFNC-2.16 "void gtk_action_set_visible_horizontal GtkAction* action gboolean visible_horizontal")
-;;; (CFNC-2.16 "gboolean gtk_action_get_visible_horizontal GtkAction* action")
-;;; (CFNC-2.16 "void gtk_action_set_visible_vertical GtkAction* action gboolean visible_vertical")
-;;; (CFNC-2.16 "gboolean gtk_action_get_visible_vertical GtkAction* action")
-;;; (CFNC-2.16 "void gtk_action_set_is_important GtkAction* action gboolean is_important")
-;;; (CFNC-2.16 "gboolean gtk_action_get_is_important GtkAction* action")
-
-(CFNC-2.16 "gchar* gtk_entry_get_icon_tooltip_text GtkEntry* entry GtkEntryIconPosition icon_pos")
-(CFNC-2.16 "gchar* gtk_entry_get_icon_tooltip_markup GtkEntry* entry GtkEntryIconPosition icon_pos")
-(CFNC-2.16 "void gtk_scale_add_mark GtkScale* scale gdouble value GtkPositionType position gchar* markup")
-(CFNC-2.16 "void gtk_scale_clear_marks GtkScale* scale")
+;;; (CFNC "void gtk_action_set_label GtkAction* action gchar* label")
+;;; (CFNC "gchar* gtk_action_get_label GtkAction* action")
+;;; (CFNC "void gtk_action_set_short_label GtkAction* action gchar* short_label")
+;;; (CFNC "gchar* gtk_action_get_short_label GtkAction* action")
+;;; (CFNC "void gtk_action_set_tooltip GtkAction* action gchar* tooltip")
+;;; (CFNC "gchar* gtk_action_get_tooltip GtkAction* action")
+;;; (CFNC "void gtk_action_set_stock_id GtkAction* action gchar* stock_id")
+;;; (CFNC "gchar* gtk_action_get_stock_id GtkAction* action")
+;;; (CFNC "void gtk_action_set_gicon GtkAction* action GIcon* icon")
+;;; (CFNC "GIcon* gtk_action_get_gicon GtkAction* action")
+;;; (CFNC "void gtk_action_set_icon_name GtkAction* action gchar* icon_name")
+;;; (CFNC "gchar* gtk_action_get_icon_name GtkAction* action")
+;;; (CFNC "void gtk_action_set_visible_horizontal GtkAction* action gboolean visible_horizontal")
+;;; (CFNC "gboolean gtk_action_get_visible_horizontal GtkAction* action")
+;;; (CFNC "void gtk_action_set_visible_vertical GtkAction* action gboolean visible_vertical")
+;;; (CFNC "gboolean gtk_action_get_visible_vertical GtkAction* action")
+;;; (CFNC "void gtk_action_set_is_important GtkAction* action gboolean is_important")
+;;; (CFNC "gboolean gtk_action_get_is_important GtkAction* action")
+
+(CFNC "gchar* gtk_entry_get_icon_tooltip_text GtkEntry* entry GtkEntryIconPosition icon_pos")
+(CFNC "gchar* gtk_entry_get_icon_tooltip_markup GtkEntry* entry GtkEntryIconPosition icon_pos")
+(CFNC "void gtk_scale_add_mark GtkScale* scale gdouble value GtkPositionType position gchar* markup")
+(CFNC "void gtk_scale_clear_marks GtkScale* scale")
 
 
 
 ;;; 2.15.2 (these on 2.17.2)
-;;; (CFNC-2.18 "void gtk_image_menu_item_set_always_show_image GtkImageMenuItem* image_menu_item gboolean always_show")
-;;; (CFNC-2.18 "gboolean gtk_image_menu_item_get_always_show_image GtkImageMenuItem* image_menu_item")
+;;; (CFNC "void gtk_image_menu_item_set_always_show_image GtkImageMenuItem* image_menu_item gboolean always_show")
+;;; (CFNC "gboolean gtk_image_menu_item_get_always_show_image GtkImageMenuItem* image_menu_item")
 
-(CINT-2.18 "PANGO_WEIGHT_THIN" "PangoWeight")
-(CINT-2.18 "PANGO_WEIGHT_BOOK" "PangoWeight")
-(CINT-2.18 "PANGO_WEIGHT_MEDIUM" "PangoWeight")
+(CINT "PANGO_WEIGHT_THIN" "PangoWeight")
+(CINT "PANGO_WEIGHT_BOOK" "PangoWeight")
+(CINT "PANGO_WEIGHT_MEDIUM" "PangoWeight")
 
 ;;; 2.15.5
-(CFNC-2.18 "gchar* gtk_window_get_default_icon_name void" 'const)
+(CFNC "gchar* gtk_window_get_default_icon_name void" 'const)
 
 ;;; 2.17.1
-(CFNC-2.18 "gchar* gtk_label_get_current_uri GtkLabel* label" 'const)
+(CFNC "gchar* gtk_label_get_current_uri GtkLabel* label" 'const)
 
 
 ;;; 2.17.2
-(CCAST-2.18 "GTK_INFO_BAR(obj)" "GtkInfoBar*")
-(CCHK-2.18 "GTK_IS_INFO_BAR(obj)" "GtkInfoBar*")
-
-(CFNC-2.18 "GtkWidget* gtk_info_bar_new void")
-;(CFNC-2.18 "GtkWidget* gtk_info_bar_new_with_buttons gchar* first_button_text ...")
-(CFNC-2.18 "GtkWidget* gtk_info_bar_get_action_area GtkInfoBar* info_bar")
-(CFNC-2.18 "GtkWidget* gtk_info_bar_get_content_area GtkInfoBar* info_bar")
-(CFNC-2.18 "void gtk_info_bar_add_action_widget GtkInfoBar* info_bar GtkWidget* child gint response_id")
-(CFNC-2.18 "GtkWidget* gtk_info_bar_add_button GtkInfoBar* info_bar gchar* button_text gint response_id")
-;(CFNC-2.18 "void gtk_info_bar_add_buttons GtkInfoBar* info_bar gchar* first_button_text ...")
-(CFNC-2.18 "void gtk_info_bar_set_response_sensitive GtkInfoBar* info_bar gint response_id gboolean setting") ; const arg
-(CFNC-2.18 "void gtk_info_bar_set_default_response GtkInfoBar* info_bar gint response_id")
-(CFNC-2.18 "void gtk_info_bar_response GtkInfoBar* info_bar gint response_id")
-(CFNC-2.18 "void gtk_info_bar_set_message_type GtkInfoBar* info_bar GtkMessageType message_type")
-(CFNC-2.18 "GtkMessageType gtk_info_bar_get_message_type GtkInfoBar* info_bar")
+(CCAST "GTK_INFO_BAR(obj)" "GtkInfoBar*")
+(CCHK "GTK_IS_INFO_BAR(obj)" "GtkInfoBar*")
+
+(CFNC "GtkWidget* gtk_info_bar_new void")
+;(CFNC "GtkWidget* gtk_info_bar_new_with_buttons gchar* first_button_text ...")
+(CFNC "GtkWidget* gtk_info_bar_get_action_area GtkInfoBar* info_bar")
+(CFNC "GtkWidget* gtk_info_bar_get_content_area GtkInfoBar* info_bar")
+(CFNC "void gtk_info_bar_add_action_widget GtkInfoBar* info_bar GtkWidget* child gint response_id")
+(CFNC "GtkWidget* gtk_info_bar_add_button GtkInfoBar* info_bar gchar* button_text gint response_id")
+;(CFNC "void gtk_info_bar_add_buttons GtkInfoBar* info_bar gchar* first_button_text ...")
+(CFNC "void gtk_info_bar_set_response_sensitive GtkInfoBar* info_bar gint response_id gboolean setting") ; const arg
+(CFNC "void gtk_info_bar_set_default_response GtkInfoBar* info_bar gint response_id")
+(CFNC "void gtk_info_bar_response GtkInfoBar* info_bar gint response_id")
+(CFNC "void gtk_info_bar_set_message_type GtkInfoBar* info_bar GtkMessageType message_type")
+(CFNC "GtkMessageType gtk_info_bar_get_message_type GtkInfoBar* info_bar")
 
 
 ;;; 2.17.3
 
-;;; 3.92.1 (CINT-2.18 "GDK_WINDOW_OFFSCREEN" "GdkWindowType")
+;;; 3.92.1 (CINT "GDK_WINDOW_OFFSCREEN" "GdkWindowType")
 
-;;; (CFNC-2.18 "gboolean gdk_region_rect_equal GdkRegion* region GdkRectangle* rectangle" 'const)
-;;; 3.89.2 (CFNC-2.18 "gboolean gdk_window_ensure_native GdkWindow* window")
-(CFNC-2.18 "void gdk_window_get_root_coords GdkWindow* window gint x gint y gint* [root_x] gint* [root_y]")
-;;; 2.91.0 (CFNC-2.18 "GdkPixmap* gdk_offscreen_window_get_pixmap GdkWindow* window")
-;;; 3.89 (CFNC-2.18 "void gdk_offscreen_window_set_embedder GdkWindow* window GdkWindow* embedder")
-;;; 3.89 (CFNC-2.18 "GdkWindow* gdk_offscreen_window_get_embedder GdkWindow* window")
-;;; 3.89 (CFNC-2.18 "void gdk_window_geometry_changed GdkWindow* window")
-(CFNC-2.18 "void gtk_menu_set_reserve_toggle_size GtkMenu* menu gboolean reserve_toggle_size")
-(CFNC-2.18 "gboolean gtk_menu_get_reserve_toggle_size GtkMenu* menu")
-;;; 3.14.0 (CFNC-2.18 "void gtk_status_icon_set_title GtkStatusIcon* status_icon gchar* title")
-;;; 3.14.0 (CFNC-2.18 "gchar* gtk_status_icon_get_title GtkStatusIcon* status_icon")
+;;; (CFNC "gboolean gdk_region_rect_equal GdkRegion* region GdkRectangle* rectangle" 'const)
+;;; 3.89.2 (CFNC "gboolean gdk_window_ensure_native GdkWindow* window")
+(CFNC "void gdk_window_get_root_coords GdkWindow* window gint x gint y gint* [root_x] gint* [root_y]")
+;;; 2.91.0 (CFNC "GdkPixmap* gdk_offscreen_window_get_pixmap GdkWindow* window")
+;;; 3.89 (CFNC "void gdk_offscreen_window_set_embedder GdkWindow* window GdkWindow* embedder")
+;;; 3.89 (CFNC "GdkWindow* gdk_offscreen_window_get_embedder GdkWindow* window")
+;;; 3.89 (CFNC "void gdk_window_geometry_changed GdkWindow* window")
+(CFNC "void gtk_menu_set_reserve_toggle_size GtkMenu* menu gboolean reserve_toggle_size")
+(CFNC "gboolean gtk_menu_get_reserve_toggle_size GtkMenu* menu")
+;;; 3.14.0 (CFNC "void gtk_status_icon_set_title GtkStatusIcon* status_icon gchar* title")
+;;; 3.14.0 (CFNC "gchar* gtk_status_icon_get_title GtkStatusIcon* status_icon")
 
 
 ;;; 2.17.4
 
-(CINT-2.18 "GTK_ENTRY_BUFFER_MAX_SIZE") ; maxushort in gtk_entry_buffer.h (gint)
-;;; 2.91.6 (CLNG-2.18 "GTK_TYPE_ENTRY_BUFFER")
-(CCAST-2.18 "GTK_ENTRY_BUFFER(obj)" "GtkEntryBuffer*")
-(CCHK-2.18 "GTK_IS_ENTRY_BUFFER(obj)" "GtkEntryBuffer*")
-
-(CFNC-2.18 "GtkWidget* gtk_entry_new_with_buffer GtkEntryBuffer* buffer")
-(CFNC-2.18 "GtkEntryBuffer* gtk_entry_get_buffer GtkEntry* entry")
-(CFNC-2.18 "void gtk_entry_set_buffer GtkEntry* entry GtkEntryBuffer* buffer")
-(CFNC-2.18 "void gtk_label_set_track_visited_links GtkLabel* label gboolean track_links")
-(CFNC-2.18 "gboolean gtk_label_get_track_visited_links GtkLabel* label")
-(CFNC-2.18 "void gtk_print_operation_set_embed_page_setup GtkPrintOperation* op gboolean embed")
-(CFNC-2.18 "gboolean gtk_print_operation_get_embed_page_setup GtkPrintOperation* op")
-(CFNC-2.18 "GtkEntryBuffer* gtk_entry_buffer_new gchar* initial_chars gint n_initial_chars")
-(CFNC-2.18 "gsize gtk_entry_buffer_get_bytes GtkEntryBuffer* buffer")
-(CFNC-2.18 "guint gtk_entry_buffer_get_length GtkEntryBuffer* buffer")
-(CFNC-2.18 "gchar* gtk_entry_buffer_get_text GtkEntryBuffer* buffer" 'const)
-(CFNC-2.18 "void gtk_entry_buffer_set_text GtkEntryBuffer* buffer gchar* chars gint n_chars")
-(CFNC-2.18 "void gtk_entry_buffer_set_max_length GtkEntryBuffer* buffer guint max_length")
-(CFNC-2.18 "guint gtk_entry_buffer_get_max_length GtkEntryBuffer* buffer")
-(CFNC-2.18 "guint gtk_entry_buffer_insert_text GtkEntryBuffer* buffer guint position gchar* chars gint n_chars")
-(CFNC-2.18 "guint gtk_entry_buffer_delete_text GtkEntryBuffer* buffer guint position gint n_chars")
-(CFNC-2.18 "void gtk_entry_buffer_emit_inserted_text GtkEntryBuffer* buffer guint position gchar* chars guint n_chars")
-(CFNC-2.18 "void gtk_entry_buffer_emit_deleted_text GtkEntryBuffer* buffer guint position guint n_chars")
+(CINT "GTK_ENTRY_BUFFER_MAX_SIZE") ; maxushort in gtk_entry_buffer.h (gint)
+;;; 2.91.6 (CLNG "GTK_TYPE_ENTRY_BUFFER")
+(CCAST "GTK_ENTRY_BUFFER(obj)" "GtkEntryBuffer*")
+(CCHK "GTK_IS_ENTRY_BUFFER(obj)" "GtkEntryBuffer*")
+
+(CFNC "GtkWidget* gtk_entry_new_with_buffer GtkEntryBuffer* buffer")
+(CFNC "GtkEntryBuffer* gtk_entry_get_buffer GtkEntry* entry")
+(CFNC "void gtk_entry_set_buffer GtkEntry* entry GtkEntryBuffer* buffer")
+(CFNC "void gtk_label_set_track_visited_links GtkLabel* label gboolean track_links")
+(CFNC "gboolean gtk_label_get_track_visited_links GtkLabel* label")
+(CFNC "void gtk_print_operation_set_embed_page_setup GtkPrintOperation* op gboolean embed")
+(CFNC "gboolean gtk_print_operation_get_embed_page_setup GtkPrintOperation* op")
+(CFNC "GtkEntryBuffer* gtk_entry_buffer_new gchar* initial_chars gint n_initial_chars")
+(CFNC "gsize gtk_entry_buffer_get_bytes GtkEntryBuffer* buffer")
+(CFNC "guint gtk_entry_buffer_get_length GtkEntryBuffer* buffer")
+(CFNC "gchar* gtk_entry_buffer_get_text GtkEntryBuffer* buffer" 'const)
+(CFNC "void gtk_entry_buffer_set_text GtkEntryBuffer* buffer gchar* chars gint n_chars")
+(CFNC "void gtk_entry_buffer_set_max_length GtkEntryBuffer* buffer guint max_length")
+(CFNC "guint gtk_entry_buffer_get_max_length GtkEntryBuffer* buffer")
+(CFNC "guint gtk_entry_buffer_insert_text GtkEntryBuffer* buffer guint position gchar* chars gint n_chars")
+(CFNC "guint gtk_entry_buffer_delete_text GtkEntryBuffer* buffer guint position gint n_chars")
+(CFNC "void gtk_entry_buffer_emit_inserted_text GtkEntryBuffer* buffer guint position gchar* chars guint n_chars")
+(CFNC "void gtk_entry_buffer_emit_deleted_text GtkEntryBuffer* buffer guint position guint n_chars")
 
 
 ;;; 2.17.5
 
-(CFNC-2.18 "void gtk_cell_renderer_set_alignment GtkCellRenderer* cell gfloat xalign gfloat yalign")
-(CFNC-2.18 "void gtk_cell_renderer_get_alignment GtkCellRenderer* cell gfloat* [xalign] gfloat* [yalign]")
-(CFNC-2.18 "void gtk_cell_renderer_set_padding GtkCellRenderer* cell gint xpad gint ypad")
-(CFNC-2.18 "void gtk_cell_renderer_get_padding GtkCellRenderer* cell gint* [xpad] gint* [ypad]")
-(CFNC-2.18 "void gtk_cell_renderer_set_visible GtkCellRenderer* cell gboolean visible")
-(CFNC-2.18 "gboolean gtk_cell_renderer_get_visible GtkCellRenderer* cell")
-(CFNC-2.18 "void gtk_cell_renderer_set_sensitive GtkCellRenderer* cell gboolean sensitive")
-(CFNC-2.18 "gboolean gtk_cell_renderer_get_sensitive GtkCellRenderer* cell")
-(CFNC-2.18 "gboolean gtk_cell_renderer_toggle_get_activatable GtkCellRendererToggle* toggle")
-(CFNC-2.18 "void gtk_cell_renderer_toggle_set_activatable GtkCellRendererToggle* toggle gboolean setting")
-(CFNC-2.18 "void gtk_widget_set_can_focus GtkWidget* widget gboolean can_focus")
-(CFNC-2.18 "gboolean gtk_widget_get_can_focus GtkWidget* widget")
-(CFNC-2.18 "gboolean gtk_widget_has_focus GtkWidget* widget")
-(CFNC-2.18 "void gtk_widget_set_can_default GtkWidget* widget gboolean can_default")
-(CFNC-2.18 "gboolean gtk_widget_get_can_default GtkWidget* widget")
-(CFNC-2.18 "gboolean gtk_widget_has_default GtkWidget* widget")
-;;; (CFNC-2.18 "GtkStateType gtk_widget_get_state GtkWidget* widget")
-(CFNC-2.18 "gboolean gtk_widget_get_sensitive GtkWidget* widget")
-(CFNC-2.18 "gboolean gtk_widget_is_sensitive GtkWidget* widget")
-(CFNC-2.18 "void gtk_widget_set_has_window GtkWidget* widget gboolean has_window")
-(CFNC-2.18 "gboolean gtk_widget_get_has_window GtkWidget* widget")
-;;; 3.89 (CFNC-2.18 "gboolean gtk_widget_get_app_paintable GtkWidget* widget")
-;;; 3.13.3 (CFNC-2.18 "gboolean gtk_widget_get_double_buffered GtkWidget* widget")
+(CFNC "void gtk_cell_renderer_set_alignment GtkCellRenderer* cell gfloat xalign gfloat yalign")
+(CFNC "void gtk_cell_renderer_get_alignment GtkCellRenderer* cell gfloat* [xalign] gfloat* [yalign]")
+(CFNC "void gtk_cell_renderer_set_padding GtkCellRenderer* cell gint xpad gint ypad")
+(CFNC "void gtk_cell_renderer_get_padding GtkCellRenderer* cell gint* [xpad] gint* [ypad]")
+(CFNC "void gtk_cell_renderer_set_visible GtkCellRenderer* cell gboolean visible")
+(CFNC "gboolean gtk_cell_renderer_get_visible GtkCellRenderer* cell")
+(CFNC "void gtk_cell_renderer_set_sensitive GtkCellRenderer* cell gboolean sensitive")
+(CFNC "gboolean gtk_cell_renderer_get_sensitive GtkCellRenderer* cell")
+(CFNC "gboolean gtk_cell_renderer_toggle_get_activatable GtkCellRendererToggle* toggle")
+(CFNC "void gtk_cell_renderer_toggle_set_activatable GtkCellRendererToggle* toggle gboolean setting")
+(CFNC "void gtk_widget_set_can_focus GtkWidget* widget gboolean can_focus")
+(CFNC "gboolean gtk_widget_get_can_focus GtkWidget* widget")
+(CFNC "gboolean gtk_widget_has_focus GtkWidget* widget")
+(CFNC "void gtk_widget_set_can_default GtkWidget* widget gboolean can_default")
+(CFNC "gboolean gtk_widget_get_can_default GtkWidget* widget")
+(CFNC "gboolean gtk_widget_has_default GtkWidget* widget")
+;;; (CFNC "GtkStateType gtk_widget_get_state GtkWidget* widget")
+(CFNC "gboolean gtk_widget_get_sensitive GtkWidget* widget")
+(CFNC "gboolean gtk_widget_is_sensitive GtkWidget* widget")
+(CFNC "void gtk_widget_set_has_window GtkWidget* widget gboolean has_window")
+(CFNC "gboolean gtk_widget_get_has_window GtkWidget* widget")
+;;; 3.89 (CFNC "gboolean gtk_widget_get_app_paintable GtkWidget* widget")
+;;; 3.13.3 (CFNC "gboolean gtk_widget_get_double_buffered GtkWidget* widget")
 
 
 ;;; 2.17.7
 
-(CFNC-2.18 "GdkCursor* gdk_window_get_cursor GdkWindow* window")
-(CFNC-2.18 "void gtk_file_chooser_set_create_folders GtkFileChooser* chooser gboolean create_folders")
-(CFNC-2.18 "gboolean gtk_file_chooser_get_create_folders GtkFileChooser* chooser")
-(CFNC-2.18 "void gtk_icon_view_set_item_padding GtkIconView* icon_view gint item_padding")
-(CFNC-2.18 "gint gtk_icon_view_get_item_padding GtkIconView* icon_view")
-(CFNC-2.18 "gboolean gtk_widget_has_grab GtkWidget* widget")
-(CFNC-2.18 "void gtk_widget_set_visible GtkWidget* widget gboolean visible")
-(CFNC-2.18 "gboolean gtk_widget_get_visible GtkWidget* widget")
-;(CFNC-2.18 "void gtk_widget_get_allocation GtkWidget* widget GtkAllocation* [allocation]")
+(CFNC "GdkCursor* gdk_window_get_cursor GdkWindow* window")
+(CFNC "void gtk_file_chooser_set_create_folders GtkFileChooser* chooser gboolean create_folders")
+(CFNC "gboolean gtk_file_chooser_get_create_folders GtkFileChooser* chooser")
+(CFNC "void gtk_icon_view_set_item_padding GtkIconView* icon_view gint item_padding")
+(CFNC "gint gtk_icon_view_get_item_padding GtkIconView* icon_view")
+(CFNC "gboolean gtk_widget_has_grab GtkWidget* widget")
+(CFNC "void gtk_widget_set_visible GtkWidget* widget gboolean visible")
+(CFNC "gboolean gtk_widget_get_visible GtkWidget* widget")
+;(CFNC "void gtk_widget_get_allocation GtkWidget* widget GtkAllocation* [allocation]")
 ; the struct arg is a problem for makexg.scm
 
-;;; (CINT-2.18 "GTK_FILE_CHOOSER_PROP_CREATE_FOLDERS" "GtkFileChooserProp")
+;;; (CINT "GTK_FILE_CHOOSER_PROP_CREATE_FOLDERS" "GtkFileChooserProp")
 
 ;;; 2.17.8
-;;; 3.91.2 ;(CFNC-2.18 "void gtk_widget_set_allocation GtkWidget* widget GtkAllocation* allocation")
+;;; 3.91.2 ;(CFNC "void gtk_widget_set_allocation GtkWidget* widget GtkAllocation* allocation")
 
 
 ;;; 2.17.10
-(CFNC-2.18 "void gtk_range_set_flippable GtkRange* range gboolean flippable")
-(CFNC-2.18 "gboolean gtk_range_get_flippable GtkRange* range")
-(CFNC-2.18 "gboolean gtk_widget_is_toplevel GtkWidget* widget")
-(CFNC-2.18 "gboolean gtk_widget_is_drawable GtkWidget* widget")
-(CFNC-2.18 "void gtk_widget_set_window GtkWidget* widget GdkWindow* window")
+(CFNC "void gtk_range_set_flippable GtkRange* range gboolean flippable")
+(CFNC "gboolean gtk_range_get_flippable GtkRange* range")
+(CFNC "gboolean gtk_widget_is_toplevel GtkWidget* widget")
+(CFNC "gboolean gtk_widget_is_drawable GtkWidget* widget")
+(CFNC "void gtk_widget_set_window GtkWidget* widget GdkWindow* window")
 
 
 ;;; 2.17.11
-(CFNC-2.18 "gboolean gdk_window_is_destroyed GdkWindow* window")
-(CFNC-2.18 "void gdk_window_restack GdkWindow* window GdkWindow* sibling gboolean above")
-(CFNC-2.18 "void gtk_widget_set_receives_default GtkWidget* widget gboolean receives_default")
-(CFNC-2.18 "gboolean gtk_widget_get_receives_default GtkWidget* widget")
+(CFNC "gboolean gdk_window_is_destroyed GdkWindow* window")
+(CFNC "void gdk_window_restack GdkWindow* window GdkWindow* sibling gboolean above")
+(CFNC "void gtk_widget_set_receives_default GtkWidget* widget gboolean receives_default")
+(CFNC "gboolean gtk_widget_get_receives_default GtkWidget* widget")
 
 ;;; 2.18.0
-;;; 3.13.3 (CFNC-2.18 "void gdk_window_flush GdkWindow* window")
+;;; 3.13.3 (CFNC "void gdk_window_flush GdkWindow* window")
 
 
 ;;; 2.19.0
-(CFNC-2.20 "GtkWidget* gtk_dialog_get_widget_for_response GtkDialog* dialog gint response_id")
-;;; (CFNC-2.20 "void gtk_tooltip_set_icon_from_gicon GtkTooltip* tooltip GIcon* gicon GtkIconSize size")
-;;; gtk 4 (CFNC-2.20 "GdkWindow* gtk_viewport_get_bin_window GtkViewport* viewport")
-(CFNC-2.20 "GtkWidget* gtk_spinner_new void")
-(CFNC-2.20 "void gtk_spinner_start GtkSpinner* spinner")
-(CFNC-2.20 "void gtk_spinner_stop GtkSpinner* spinner")
-(CFNC-2.20 "GtkCellRenderer* gtk_cell_renderer_spinner_new void") ; surely they mean GtkCellRendererSpinner?
+(CFNC "GtkWidget* gtk_dialog_get_widget_for_response GtkDialog* dialog gint response_id")
+;;; (CFNC "void gtk_tooltip_set_icon_from_gicon GtkTooltip* tooltip GIcon* gicon GtkIconSize size")
+;;; gtk 4 (CFNC "GdkWindow* gtk_viewport_get_bin_window GtkViewport* viewport")
+(CFNC "GtkWidget* gtk_spinner_new void")
+(CFNC "void gtk_spinner_start GtkSpinner* spinner")
+(CFNC "void gtk_spinner_stop GtkSpinner* spinner")
+(CFNC "GtkCellRenderer* gtk_cell_renderer_spinner_new void") ; surely they mean GtkCellRendererSpinner?
 
-(CCAST-2.20 "GTK_SPINNER(obj)" "GtkSpinner*")
-(CCHK-2.20 "GTK_IS_SPINNER(obj)" "GtkSpinner*")
+(CCAST "GTK_SPINNER(obj)" "GtkSpinner*")
+(CCHK "GTK_IS_SPINNER(obj)" "GtkSpinner*")
 
-(CCAST-2.20 "GTK_CELL_RENDERER_SPINNER(obj)" "GtkCellRendererSpinner*")
-(CCHK-2.20 "GTK_IS_CELL_RENDERER_SPINNER(obj)" "GtkCellRendererSpinner*")
+(CCAST "GTK_CELL_RENDERER_SPINNER(obj)" "GtkCellRendererSpinner*")
+(CCHK "GTK_IS_CELL_RENDERER_SPINNER(obj)" "GtkCellRendererSpinner*")
 
 ;;; 2.19.1
-(CCAST-2.20 "GTK_TOOL_PALETTE(obj)" "GtkToolPalette*")
-(CCHK-2.20 "GTK_IS_TOOL_PALETTE(obj)" "GtkToolPalette*")
-(CCAST-2.20 "GTK_TOOL_ITEM_GROUP(obj)" "GtkToolItemGroup*")
-(CCHK-2.20 "GTK_IS_TOOL_ITEM_GROUP(obj)" "GtkToolItemGroup*")
-
-;;; (CFNC-2.20 "void gtk_action_set_always_show_image GtkAction* action gboolean always_show")
-;;; (CFNC-2.20 "gboolean gtk_action_get_always_show_image GtkAction* action")
-(CFNC-2.20 "GtkWidget* gtk_notebook_get_action_widget GtkNotebook* notebook GtkPackType pack_type")
-(CFNC-2.20 "void gtk_notebook_set_action_widget GtkNotebook* notebook GtkWidget* widget GtkPackType pack_type")
-(CFNC-2.20 "GtkWidget* gtk_statusbar_get_message_area GtkStatusbar* statusbar")
-(CFNC-2.20 "PangoEllipsizeMode gtk_tool_item_get_ellipsize_mode GtkToolItem* tool_item")
-(CFNC-2.20 "gfloat gtk_tool_item_get_text_alignment GtkToolItem* tool_item")
-(CFNC-2.20 "GtkOrientation gtk_tool_item_get_text_orientation GtkToolItem* tool_item")
-(CFNC-2.20 "GtkSizeGroup* gtk_tool_item_get_text_size_group GtkToolItem* tool_item")
-;;; (CFNC-2.20 "GtkWindowType gtk_window_get_window_type GtkWindow* window")
-(CFNC-2.20 "GtkWidget* gtk_tool_palette_new void")
-(CFNC-2.20 "void gtk_tool_palette_set_group_position GtkToolPalette* palette GtkToolItemGroup* group gint position") ; these changed GtkWidget* to GtkToolItemGroup*
-(CFNC-2.20 "void gtk_tool_palette_set_exclusive GtkToolPalette* palette GtkToolItemGroup* group gboolean exclusive")
-(CFNC-2.20 "void gtk_tool_palette_set_expand GtkToolPalette* palette GtkToolItemGroup* group gboolean expand")
-(CFNC-2.20 "gint gtk_tool_palette_get_group_position GtkToolPalette* palette GtkToolItemGroup* group")
-(CFNC-2.20 "gboolean gtk_tool_palette_get_exclusive GtkToolPalette* palette GtkToolItemGroup* group")
-(CFNC-2.20 "gboolean gtk_tool_palette_get_expand GtkToolPalette* palette GtkToolItemGroup* group")
-;;; (CFNC-2.20 "void gtk_tool_palette_set_icon_size GtkToolPalette* palette GtkIconSize icon_size")
-;;; 3.93.0 (CFNC-2.20 "void gtk_tool_palette_unset_icon_size GtkToolPalette* palette")
-(CFNC-2.20 "void gtk_tool_palette_set_style GtkToolPalette* palette GtkToolbarStyle style")
-(CFNC-2.20 "void gtk_tool_palette_unset_style GtkToolPalette* palette")
-;;; (CFNC-2.20 "GtkIconSize gtk_tool_palette_get_icon_size GtkToolPalette* palette")
-(CFNC-2.20 "GtkToolbarStyle gtk_tool_palette_get_style GtkToolPalette* palette")
-(CFNC-2.20 "GtkToolItem* gtk_tool_palette_get_drop_item GtkToolPalette* palette gint x gint y")
-(CFNC-2.20 "GtkToolItemGroup* gtk_tool_palette_get_drop_group GtkToolPalette* palette gint x gint y")
-(CFNC-2.20 "GtkWidget* gtk_tool_palette_get_drag_item GtkToolPalette* palette GtkSelectionData* selection")
-(CFNC-2.20 "void gtk_tool_palette_set_drag_source GtkToolPalette* palette GtkToolPaletteDragTargets targets")
-(CFNC-2.20 "void gtk_tool_palette_add_drag_dest GtkToolPalette* palette GtkWidget* widget GtkDestDefaults flags GtkToolPaletteDragTargets targets GdkDragAction actions")
-;;; 2.91.2 (CFNC-2.20 "GtkAdjustment* gtk_tool_palette_get_hadjustment GtkToolPalette* palette")
-;;; 2.91.2 (CFNC-2.20 "GtkAdjustment* gtk_tool_palette_get_vadjustment GtkToolPalette* palette")
-;;; 3.93.0 (CFNC-2.20 "GtkTargetEntry* gtk_tool_palette_get_drag_target_item void" 'const-return)
-;;; 3.93.0 (CFNC-2.20 "GtkTargetEntry* gtk_tool_palette_get_drag_target_group void" 'const-return)
-(CFNC-2.20 "GtkWidget* gtk_tool_item_group_new gchar* label" 'const)
-(CFNC-2.20 "void gtk_tool_item_group_set_label GtkToolItemGroup* group gchar* label" 'const)
-(CFNC-2.20 "void gtk_tool_item_group_set_label_widget GtkToolItemGroup* group GtkWidget* label_widget")
-(CFNC-2.20 "void gtk_tool_item_group_set_collapsed GtkToolItemGroup* group gboolean collapsed")
-(CFNC-2.20 "void gtk_tool_item_group_set_ellipsize GtkToolItemGroup* group PangoEllipsizeMode ellipsize")
-(CFNC-2.20 "void gtk_tool_item_group_set_header_relief GtkToolItemGroup* group GtkReliefStyle style")
-(CFNC-2.20 "gchar* gtk_tool_item_group_get_label GtkToolItemGroup* group")
-(CFNC-2.20 "GtkWidget* gtk_tool_item_group_get_label_widget GtkToolItemGroup* group")
-(CFNC-2.20 "gboolean gtk_tool_item_group_get_collapsed GtkToolItemGroup* group")
-(CFNC-2.20 "PangoEllipsizeMode gtk_tool_item_group_get_ellipsize GtkToolItemGroup* group")
-(CFNC-2.20 "GtkReliefStyle gtk_tool_item_group_get_header_relief GtkToolItemGroup* group")
-(CFNC-2.20 "void gtk_tool_item_group_insert GtkToolItemGroup* group GtkToolItem* item gint position")
-(CFNC-2.20 "void gtk_tool_item_group_set_item_position GtkToolItemGroup* group GtkToolItem* item gint position")
-(CFNC-2.20 "gint gtk_tool_item_group_get_item_position GtkToolItemGroup* group GtkToolItem* item")
-(CFNC-2.20 "guint gtk_tool_item_group_get_n_items GtkToolItemGroup* group")
-(CFNC-2.20 "GtkToolItem* gtk_tool_item_group_get_nth_item GtkToolItemGroup* group guint index")
-(CFNC-2.20 "GtkToolItem* gtk_tool_item_group_get_drop_item GtkToolItemGroup* group gint x gint y")
+(CCAST "GTK_TOOL_PALETTE(obj)" "GtkToolPalette*")
+(CCHK "GTK_IS_TOOL_PALETTE(obj)" "GtkToolPalette*")
+(CCAST "GTK_TOOL_ITEM_GROUP(obj)" "GtkToolItemGroup*")
+(CCHK "GTK_IS_TOOL_ITEM_GROUP(obj)" "GtkToolItemGroup*")
+
+;;; (CFNC "void gtk_action_set_always_show_image GtkAction* action gboolean always_show")
+;;; (CFNC "gboolean gtk_action_get_always_show_image GtkAction* action")
+(CFNC "GtkWidget* gtk_notebook_get_action_widget GtkNotebook* notebook GtkPackType pack_type")
+(CFNC "void gtk_notebook_set_action_widget GtkNotebook* notebook GtkWidget* widget GtkPackType pack_type")
+(CFNC "GtkWidget* gtk_statusbar_get_message_area GtkStatusbar* statusbar")
+(CFNC "PangoEllipsizeMode gtk_tool_item_get_ellipsize_mode GtkToolItem* tool_item")
+(CFNC "gfloat gtk_tool_item_get_text_alignment GtkToolItem* tool_item")
+(CFNC "GtkOrientation gtk_tool_item_get_text_orientation GtkToolItem* tool_item")
+(CFNC "GtkSizeGroup* gtk_tool_item_get_text_size_group GtkToolItem* tool_item")
+;;; (CFNC "GtkWindowType gtk_window_get_window_type GtkWindow* window")
+(CFNC "GtkWidget* gtk_tool_palette_new void")
+(CFNC "void gtk_tool_palette_set_group_position GtkToolPalette* palette GtkToolItemGroup* group gint position") ; these changed GtkWidget* to GtkToolItemGroup*
+(CFNC "void gtk_tool_palette_set_exclusive GtkToolPalette* palette GtkToolItemGroup* group gboolean exclusive")
+(CFNC "void gtk_tool_palette_set_expand GtkToolPalette* palette GtkToolItemGroup* group gboolean expand")
+(CFNC "gint gtk_tool_palette_get_group_position GtkToolPalette* palette GtkToolItemGroup* group")
+(CFNC "gboolean gtk_tool_palette_get_exclusive GtkToolPalette* palette GtkToolItemGroup* group")
+(CFNC "gboolean gtk_tool_palette_get_expand GtkToolPalette* palette GtkToolItemGroup* group")
+;;; (CFNC "void gtk_tool_palette_set_icon_size GtkToolPalette* palette GtkIconSize icon_size")
+;;; 3.93.0 (CFNC "void gtk_tool_palette_unset_icon_size GtkToolPalette* palette")
+(CFNC "void gtk_tool_palette_set_style GtkToolPalette* palette GtkToolbarStyle style")
+(CFNC "void gtk_tool_palette_unset_style GtkToolPalette* palette")
+;;; (CFNC "GtkIconSize gtk_tool_palette_get_icon_size GtkToolPalette* palette")
+(CFNC "GtkToolbarStyle gtk_tool_palette_get_style GtkToolPalette* palette")
+(CFNC "GtkToolItem* gtk_tool_palette_get_drop_item GtkToolPalette* palette gint x gint y")
+(CFNC "GtkToolItemGroup* gtk_tool_palette_get_drop_group GtkToolPalette* palette gint x gint y")
+(CFNC "GtkWidget* gtk_tool_palette_get_drag_item GtkToolPalette* palette GtkSelectionData* selection")
+(CFNC "void gtk_tool_palette_set_drag_source GtkToolPalette* palette GtkToolPaletteDragTargets targets")
+(CFNC "void gtk_tool_palette_add_drag_dest GtkToolPalette* palette GtkWidget* widget GtkDestDefaults flags GtkToolPaletteDragTargets targets GdkDragAction actions")
+;;; 2.91.2 (CFNC "GtkAdjustment* gtk_tool_palette_get_hadjustment GtkToolPalette* palette")
+;;; 2.91.2 (CFNC "GtkAdjustment* gtk_tool_palette_get_vadjustment GtkToolPalette* palette")
+;;; 3.93.0 (CFNC "GtkTargetEntry* gtk_tool_palette_get_drag_target_item void" 'const-return)
+;;; 3.93.0 (CFNC "GtkTargetEntry* gtk_tool_palette_get_drag_target_group void" 'const-return)
+(CFNC "GtkWidget* gtk_tool_item_group_new gchar* label" 'const)
+(CFNC "void gtk_tool_item_group_set_label GtkToolItemGroup* group gchar* label" 'const)
+(CFNC "void gtk_tool_item_group_set_label_widget GtkToolItemGroup* group GtkWidget* label_widget")
+(CFNC "void gtk_tool_item_group_set_collapsed GtkToolItemGroup* group gboolean collapsed")
+(CFNC "void gtk_tool_item_group_set_ellipsize GtkToolItemGroup* group PangoEllipsizeMode ellipsize")
+(CFNC "void gtk_tool_item_group_set_header_relief GtkToolItemGroup* group GtkReliefStyle style")
+(CFNC "gchar* gtk_tool_item_group_get_label GtkToolItemGroup* group")
+(CFNC "GtkWidget* gtk_tool_item_group_get_label_widget GtkToolItemGroup* group")
+(CFNC "gboolean gtk_tool_item_group_get_collapsed GtkToolItemGroup* group")
+(CFNC "PangoEllipsizeMode gtk_tool_item_group_get_ellipsize GtkToolItemGroup* group")
+(CFNC "GtkReliefStyle gtk_tool_item_group_get_header_relief GtkToolItemGroup* group")
+(CFNC "void gtk_tool_item_group_insert GtkToolItemGroup* group GtkToolItem* item gint position")
+(CFNC "void gtk_tool_item_group_set_item_position GtkToolItemGroup* group GtkToolItem* item gint position")
+(CFNC "gint gtk_tool_item_group_get_item_position GtkToolItemGroup* group GtkToolItem* item")
+(CFNC "guint gtk_tool_item_group_get_n_items GtkToolItemGroup* group")
+(CFNC "GtkToolItem* gtk_tool_item_group_get_nth_item GtkToolItemGroup* group guint index")
+(CFNC "GtkToolItem* gtk_tool_item_group_get_drop_item GtkToolItemGroup* group gint x gint y")
 
 ;;; 2.19.2
-;; (CFNC-2.20 "gboolean gdk_keymap_map_virtual_modifiers GdkKeymap* keymap GdkModifierType *state")
+;; (CFNC "gboolean gdk_keymap_map_virtual_modifiers GdkKeymap* keymap GdkModifierType *state")
 ;;  there is no code for this!
-;;; 3.22.2 (CFNC-2.20 "gint gdk_screen_get_primary_monitor GdkScreen* screen")
-(CFNC-2.20 "void gtk_window_set_mnemonics_visible GtkWindow* window gboolean setting")
-(CFNC-2.20 "gboolean gtk_window_get_mnemonics_visible GtkWindow* window")
+;;; 3.22.2 (CFNC "gint gdk_screen_get_primary_monitor GdkScreen* screen")
+(CFNC "void gtk_window_set_mnemonics_visible GtkWindow* window gboolean setting")
+(CFNC "gboolean gtk_window_get_mnemonics_visible GtkWindow* window")
 
 
 ;;; 2.19.4
-;;; 2.91.2 (CFNC-2.20 "GdkWindow* gtk_entry_get_text_window GtkEntry* entry")
-;;; 2.91.2 (CFNC-2.20 "GdkWindow* gtk_entry_get_icon_window GtkEntry* entry GtkEntryIconPosition icon_pos")
-(CFNC-2.20 "void gtk_range_set_slider_size_fixed GtkRange* range gboolean size_fixed")
-(CFNC-2.20 "gboolean gtk_range_get_slider_size_fixed GtkRange* range")
-;;; 3.20 (CFNC-2.20 "void gtk_range_set_min_slider_size GtkRange* range gboolean min_size")
-;;; 3.20 (CFNC-2.20 "gint gtk_range_get_min_slider_size GtkRange* range")
-(CFNC-2.20 "void gtk_range_get_range_rect GtkRange* range GdkRectangle* range_rect")
-(CFNC-2.20 "void gtk_range_get_slider_range GtkRange* range gint* [slider_start] gint* [slider_end]")
-;;; 3.14.0 (CFNC-2.20 "void gtk_status_icon_set_name GtkStatusIcon* status_icon gchar* name") ; const gchar
-;;; 2.91.6 (CFNC-2.20 "gboolean gtk_widget_has_rc_style GtkWidget* widget")
+;;; 2.91.2 (CFNC "GdkWindow* gtk_entry_get_text_window GtkEntry* entry")
+;;; 2.91.2 (CFNC "GdkWindow* gtk_entry_get_icon_window GtkEntry* entry GtkEntryIconPosition icon_pos")
+(CFNC "void gtk_range_set_slider_size_fixed GtkRange* range gboolean size_fixed")
+(CFNC "gboolean gtk_range_get_slider_size_fixed GtkRange* range")
+;;; 3.20 (CFNC "void gtk_range_set_min_slider_size GtkRange* range gboolean min_size")
+;;; 3.20 (CFNC "gint gtk_range_get_min_slider_size GtkRange* range")
+(CFNC "void gtk_range_get_range_rect GtkRange* range GdkRectangle* range_rect")
+(CFNC "void gtk_range_get_slider_range GtkRange* range gint* [slider_start] gint* [slider_end]")
+;;; 3.14.0 (CFNC "void gtk_status_icon_set_name GtkStatusIcon* status_icon gchar* name") ; const gchar
+;;; 2.91.6 (CFNC "gboolean gtk_widget_has_rc_style GtkWidget* widget")
 
 ;;; 2.19.5
-;;; 3.91.2 (CFNC-2.20 "GdkWindow* gtk_paned_get_handle_window GtkPaned* paned")
-;;; 2.99.1 (CFNC-2.20 "void gtk_widget_style_attach GtkWidget* style")
-(CFNC-2.20 "void gtk_widget_set_realized GtkWidget* widget gboolean realized")
-(CFNC-2.20 "gboolean gtk_widget_get_realized GtkWidget* widget")
-;;; 3.89 (CFNC-2.20 "void gtk_widget_set_mapped GtkWidget* widget gboolean mapped")
-(CFNC-2.20 "gboolean gtk_widget_get_mapped GtkWidget* widget")
+;;; 3.91.2 (CFNC "GdkWindow* gtk_paned_get_handle_window GtkPaned* paned")
+;;; 2.99.1 (CFNC "void gtk_widget_style_attach GtkWidget* style")
+(CFNC "void gtk_widget_set_realized GtkWidget* widget gboolean realized")
+(CFNC "gboolean gtk_widget_get_realized GtkWidget* widget")
+;;; 3.89 (CFNC "void gtk_widget_set_mapped GtkWidget* widget gboolean mapped")
+(CFNC "gboolean gtk_widget_get_mapped GtkWidget* widget")
 
 
 ;;; 2.19.6
@@ -7458,124 +7458,124 @@
 ;;; 1.9.12: HAVE_CAIRO_REGION_XOR
 
 
-(CAIRO-INT-810 "CAIRO_STATUS_FONT_TYPE_MISMATCH" "cairo_status_t")
-(CAIRO-INT-810 "CAIRO_STATUS_USER_FONT_IMMUTABLE" "cairo_status_t")
-(CAIRO-INT-810 "CAIRO_STATUS_USER_FONT_ERROR" "cairo_status_t")
-(CAIRO-INT-810 "CAIRO_STATUS_NEGATIVE_COUNT" "cairo_status_t")
-(CAIRO-INT-810 "CAIRO_STATUS_INVALID_CLUSTERS" "cairo_status_t")
-(CAIRO-INT-810 "CAIRO_STATUS_INVALID_SLANT" "cairo_status_t")
-(CAIRO-INT-810 "CAIRO_STATUS_INVALID_WEIGHT" "cairo_status_t")
+(CAIRO-INT "CAIRO_STATUS_FONT_TYPE_MISMATCH" "cairo_status_t")
+(CAIRO-INT "CAIRO_STATUS_USER_FONT_IMMUTABLE" "cairo_status_t")
+(CAIRO-INT "CAIRO_STATUS_USER_FONT_ERROR" "cairo_status_t")
+(CAIRO-INT "CAIRO_STATUS_NEGATIVE_COUNT" "cairo_status_t")
+(CAIRO-INT "CAIRO_STATUS_INVALID_CLUSTERS" "cairo_status_t")
+(CAIRO-INT "CAIRO_STATUS_INVALID_SLANT" "cairo_status_t")
+(CAIRO-INT "CAIRO_STATUS_INVALID_WEIGHT" "cairo_status_t")
 
 ;;; CAIRO_TEXT_CLUSTER_FLAG_BACKWARD = 0x00000001
 
-(CAIRO-FUNC-810 "cairo_glyph_t* cairo_glyph_allocate int num_glyphs")
-(CAIRO-FUNC-810 "void cairo_glyph_free cairo_glyph_t* glyphs")
-(CAIRO-FUNC-810 "cairo_text_cluster_t* cairo_text_cluster_allocate int num_clusters")
-(CAIRO-FUNC-810 "void cairo_text_cluster_free cairo_text_cluster_t* clusters")
-(CAIRO-FUNC-810 "void cairo_show_text_glyphs cairo_t* cr char* utf8 int utf8_len cairo_glyph_t* glyphs int num_glyphs cairo_text_cluster_t* clusters int num_clusters cairo_text_cluster_flags_t cluster_flags" 'const)
-(CAIRO-FUNC-810 "cairo_status_t cairo_scaled_font_text_to_glyphs cairo_scaled_font_t* scaled_font double x double y char* utf8 int utf8_len cairo_glyph_t** glyphs int* num_glyphs cairo_text_cluster_t** clusters int* num_clusters cairo_text_cluster_flags_t* cluster_flags" 'const)
-(CAIRO-FUNC-810 "void cairo_scaled_font_get_scale_matrix cairo_scaled_font_t* scaled_font cairo_matrix_t* scale_matrix")
-(CAIRO-FUNC-810 "cairo_font_face_t* cairo_toy_font_face_create char* family cairo_font_slant_t slant cairo_font_weight_t weight" 'const)
-(CAIRO-FUNC-810 "char* cairo_toy_font_face_get_family cairo_font_face_t* font_face" 'const) ; return
-(CAIRO-FUNC-810 "cairo_font_slant_t cairo_toy_font_face_get_slant cairo_font_face_t* font_face")
-(CAIRO-FUNC-810 "cairo_font_weight_t cairo_toy_font_face_get_weight cairo_font_face_t* font_face")
-(CAIRO-FUNC-810 "cairo_font_face_t* cairo_user_font_face_create void")
-;(CAIRO-FUNC-810 "void cairo_user_font_face_set_init_func cairo_font_face_t* font_face cairo_user_scaled_font_init_func_t init_func")
-;(CAIRO-FUNC-810 "void cairo_user_font_face_set_render_glyph_func cairo_font_face_t* font_face cairo_user_scaled_font_render_glyph_func_t render_glyph_func")
-;(CAIRO-FUNC-810 "void cairo_user_font_face_set_text_to_glyphs_func cairo_font_face_t* font_face cairo_user_scaled_font_text_to_glyphs_func_t text_to_glyphs_func")
-;(CAIRO-FUNC-810 "void cairo_user_font_face_set_unicode_to_glyph_func cairo_font_face_t* font_face cairo_user_scaled_font_unicode_to_glyph_func_t unicode_to_glyph_func")
-;(CAIRO-FUNC-810 "cairo_user_scaled_font_init_func_t cairo_user_font_face_get_init_func cairo_font_face_t* font_face")
-;(CAIRO-FUNC-810 "cairo_user_scaled_font_render_glyph_func_t cairo_user_font_face_get_render_glyph_func cairo_font_face_t* font_face")
-;(CAIRO-FUNC-810 "cairo_user_scaled_font_text_to_glyphs_func_t cairo_user_font_face_get_text_to_glyphs_func cairo_font_face_t* font_face")
-;(CAIRO-FUNC-810 "cairo_user_scaled_font_unicode_to_glyph_func_t cairo_user_font_face_get_unicode_to_glyph_func cairo_font_face_t* font_face")
-(CAIRO-FUNC-810 "void cairo_surface_get_fallback_resolution cairo_surface_t* surface double* [x_pixels_per_inch] double* [y_pixels_per_inch]")
-(CAIRO-FUNC-810 "cairo_bool_t cairo_surface_has_show_text_glyphs cairo_surface_t* surface")
+(CAIRO-FUNC "cairo_glyph_t* cairo_glyph_allocate int num_glyphs")
+(CAIRO-FUNC "void cairo_glyph_free cairo_glyph_t* glyphs")
+(CAIRO-FUNC "cairo_text_cluster_t* cairo_text_cluster_allocate int num_clusters")
+(CAIRO-FUNC "void cairo_text_cluster_free cairo_text_cluster_t* clusters")
+(CAIRO-FUNC "void cairo_show_text_glyphs cairo_t* cr char* utf8 int utf8_len cairo_glyph_t* glyphs int num_glyphs cairo_text_cluster_t* clusters int num_clusters cairo_text_cluster_flags_t cluster_flags" 'const)
+(CAIRO-FUNC "cairo_status_t cairo_scaled_font_text_to_glyphs cairo_scaled_font_t* scaled_font double x double y char* utf8 int utf8_len cairo_glyph_t** glyphs int* num_glyphs cairo_text_cluster_t** clusters int* num_clusters cairo_text_cluster_flags_t* cluster_flags" 'const)
+(CAIRO-FUNC "void cairo_scaled_font_get_scale_matrix cairo_scaled_font_t* scaled_font cairo_matrix_t* scale_matrix")
+(CAIRO-FUNC "cairo_font_face_t* cairo_toy_font_face_create char* family cairo_font_slant_t slant cairo_font_weight_t weight" 'const)
+(CAIRO-FUNC "char* cairo_toy_font_face_get_family cairo_font_face_t* font_face" 'const) ; return
+(CAIRO-FUNC "cairo_font_slant_t cairo_toy_font_face_get_slant cairo_font_face_t* font_face")
+(CAIRO-FUNC "cairo_font_weight_t cairo_toy_font_face_get_weight cairo_font_face_t* font_face")
+(CAIRO-FUNC "cairo_font_face_t* cairo_user_font_face_create void")
+;(CAIRO-FUNC "void cairo_user_font_face_set_init_func cairo_font_face_t* font_face cairo_user_scaled_font_init_func_t init_func")
+;(CAIRO-FUNC "void cairo_user_font_face_set_render_glyph_func cairo_font_face_t* font_face cairo_user_scaled_font_render_glyph_func_t render_glyph_func")
+;(CAIRO-FUNC "void cairo_user_font_face_set_text_to_glyphs_func cairo_font_face_t* font_face cairo_user_scaled_font_text_to_glyphs_func_t text_to_glyphs_func")
+;(CAIRO-FUNC "void cairo_user_font_face_set_unicode_to_glyph_func cairo_font_face_t* font_face cairo_user_scaled_font_unicode_to_glyph_func_t unicode_to_glyph_func")
+;(CAIRO-FUNC "cairo_user_scaled_font_init_func_t cairo_user_font_face_get_init_func cairo_font_face_t* font_face")
+;(CAIRO-FUNC "cairo_user_scaled_font_render_glyph_func_t cairo_user_font_face_get_render_glyph_func cairo_font_face_t* font_face")
+;(CAIRO-FUNC "cairo_user_scaled_font_text_to_glyphs_func_t cairo_user_font_face_get_text_to_glyphs_func cairo_font_face_t* font_face")
+;(CAIRO-FUNC "cairo_user_scaled_font_unicode_to_glyph_func_t cairo_user_font_face_get_unicode_to_glyph_func cairo_font_face_t* font_face")
+(CAIRO-FUNC "void cairo_surface_get_fallback_resolution cairo_surface_t* surface double* [x_pixels_per_inch] double* [y_pixels_per_inch]")
+(CAIRO-FUNC "cairo_bool_t cairo_surface_has_show_text_glyphs cairo_surface_t* surface")
 
 ;;; 1.9
 
-(CAIRO-INT-912 "CAIRO_STATUS_INVALID_SIZE" "cairo_status_t")
-(CAIRO-INT-912 "CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED" "cairo_status_t")
-(CAIRO-INT-912 "CAIRO_STATUS_DEVICE_TYPE_MISMATCH" "cairo_status_t")
-(CAIRO-INT-912 "CAIRO_STATUS_DEVICE_ERROR" "cairo_status_t")
-
-(CAIRO-INT-912 "CAIRO_OPERATOR_MULTIPLY" "cairo_operator_t")
-(CAIRO-INT-912 "CAIRO_OPERATOR_SCREEN" "cairo_operator_t")
-(CAIRO-INT-912 "CAIRO_OPERATOR_OVERLAY" "cairo_operator_t")
-(CAIRO-INT-912 "CAIRO_OPERATOR_DARKEN" "cairo_operator_t")
-(CAIRO-INT-912 "CAIRO_OPERATOR_LIGHTEN" "cairo_operator_t")
-(CAIRO-INT-912 "CAIRO_OPERATOR_COLOR_DODGE" "cairo_operator_t")
-(CAIRO-INT-912 "CAIRO_OPERATOR_COLOR_BURN" "cairo_operator_t")
-(CAIRO-INT-912 "CAIRO_OPERATOR_HARD_LIGHT" "cairo_operator_t")
-(CAIRO-INT-912 "CAIRO_OPERATOR_SOFT_LIGHT" "cairo_operator_t")
-(CAIRO-INT-912 "CAIRO_OPERATOR_DIFFERENCE" "cairo_operator_t")
-(CAIRO-INT-912 "CAIRO_OPERATOR_EXCLUSION" "cairo_operator_t")
-(CAIRO-INT-912 "CAIRO_OPERATOR_HSL_HUE" "cairo_operator_t")
-(CAIRO-INT-912 "CAIRO_OPERATOR_HSL_SATURATION" "cairo_operator_t")
-(CAIRO-INT-912 "CAIRO_OPERATOR_HSL_COLOR" "cairo_operator_t")
-(CAIRO-INT-912 "CAIRO_OPERATOR_HSL_LUMINOSITY" "cairo_operator_t")
-
-(CAIRO-INT-912 "CAIRO_SURFACE_TYPE_SCRIPT" "cairo_surface_t")
-(CAIRO-INT-912 "CAIRO_SURFACE_TYPE_QT" "cairo_surface_t")
-(CAIRO-INT-912 "CAIRO_SURFACE_TYPE_RECORDING" "cairo_surface_t")
-(CAIRO-INT-912 "CAIRO_SURFACE_TYPE_VG" "cairo_surface_t")
-(CAIRO-INT-912 "CAIRO_SURFACE_TYPE_GL" "cairo_surface_t")
-(CAIRO-INT-912 "CAIRO_SURFACE_TYPE_DRM" "cairo_surface_t")
-(CAIRO-INT-912 "CAIRO_SURFACE_TYPE_TEE" "cairo_surface_t")
-(CAIRO-INT-912 "CAIRO_SURFACE_TYPE_XML" "cairo_surface_t")
-(CAIRO-INT-912 "CAIRO_SURFACE_TYPE_SKIA" "cairo_surface_t")
-
-(CAIRO-STRING-912 "CAIRO_MIME_TYPE_JPEG") ; "image/jpeg")
-(CAIRO-STRING-912 "CAIRO_MIME_TYPE_PNG") ; "image/png")
-(CAIRO-STRING-912 "CAIRO_MIME_TYPE_JP2") ; "image/jp2")
-(CAIRO-STRING-912 "CAIRO_MIME_TYPE_URI") ; "text/x-uri")
+(CAIRO-INT "CAIRO_STATUS_INVALID_SIZE" "cairo_status_t")
+(CAIRO-INT "CAIRO_STATUS_USER_FONT_NOT_IMPLEMENTED" "cairo_status_t")
+(CAIRO-INT "CAIRO_STATUS_DEVICE_TYPE_MISMATCH" "cairo_status_t")
+(CAIRO-INT "CAIRO_STATUS_DEVICE_ERROR" "cairo_status_t")
+
+(CAIRO-INT "CAIRO_OPERATOR_MULTIPLY" "cairo_operator_t")
+(CAIRO-INT "CAIRO_OPERATOR_SCREEN" "cairo_operator_t")
+(CAIRO-INT "CAIRO_OPERATOR_OVERLAY" "cairo_operator_t")
+(CAIRO-INT "CAIRO_OPERATOR_DARKEN" "cairo_operator_t")
+(CAIRO-INT "CAIRO_OPERATOR_LIGHTEN" "cairo_operator_t")
+(CAIRO-INT "CAIRO_OPERATOR_COLOR_DODGE" "cairo_operator_t")
+(CAIRO-INT "CAIRO_OPERATOR_COLOR_BURN" "cairo_operator_t")
+(CAIRO-INT "CAIRO_OPERATOR_HARD_LIGHT" "cairo_operator_t")
+(CAIRO-INT "CAIRO_OPERATOR_SOFT_LIGHT" "cairo_operator_t")
+(CAIRO-INT "CAIRO_OPERATOR_DIFFERENCE" "cairo_operator_t")
+(CAIRO-INT "CAIRO_OPERATOR_EXCLUSION" "cairo_operator_t")
+(CAIRO-INT "CAIRO_OPERATOR_HSL_HUE" "cairo_operator_t")
+(CAIRO-INT "CAIRO_OPERATOR_HSL_SATURATION" "cairo_operator_t")
+(CAIRO-INT "CAIRO_OPERATOR_HSL_COLOR" "cairo_operator_t")
+(CAIRO-INT "CAIRO_OPERATOR_HSL_LUMINOSITY" "cairo_operator_t")
+
+(CAIRO-INT "CAIRO_SURFACE_TYPE_SCRIPT" "cairo_surface_t")
+(CAIRO-INT "CAIRO_SURFACE_TYPE_QT" "cairo_surface_t")
+(CAIRO-INT "CAIRO_SURFACE_TYPE_RECORDING" "cairo_surface_t")
+(CAIRO-INT "CAIRO_SURFACE_TYPE_VG" "cairo_surface_t")
+(CAIRO-INT "CAIRO_SURFACE_TYPE_GL" "cairo_surface_t")
+(CAIRO-INT "CAIRO_SURFACE_TYPE_DRM" "cairo_surface_t")
+(CAIRO-INT "CAIRO_SURFACE_TYPE_TEE" "cairo_surface_t")
+(CAIRO-INT "CAIRO_SURFACE_TYPE_XML" "cairo_surface_t")
+(CAIRO-INT "CAIRO_SURFACE_TYPE_SKIA" "cairo_surface_t")
+
+(CAIRO-STRING "CAIRO_MIME_TYPE_JPEG") ; "image/jpeg")
+(CAIRO-STRING "CAIRO_MIME_TYPE_PNG") ; "image/png")
+(CAIRO-STRING "CAIRO_MIME_TYPE_JP2") ; "image/jp2")
+(CAIRO-STRING "CAIRO_MIME_TYPE_URI") ; "text/x-uri")
 
 ;;;  CAIRO_FORMAT_INVALID = -1 
 
-(CAIRO-FUNC-912 "cairo_bool_t cairo_in_clip cairo_t* cr double x double y")
-(CAIRO-FUNC-912 "cairo_device_t* cairo_device_reference cairo_device_t* device")
-(CAIRO-FUNC-912 "cairo_status_t cairo_device_status cairo_device_t* device")
-(CAIRO-FUNC-912 "cairo_status_t cairo_device_acquire cairo_device_t* device")
-(CAIRO-FUNC-912 "void cairo_device_release cairo_device_t* device")
-(CAIRO-FUNC-912 "void cairo_device_flush cairo_device_t* device")
-(CAIRO-FUNC-912 "void cairo_device_finish cairo_device_t* device")
-(CAIRO-FUNC-912 "void cairo_device_destroy cairo_device_t* device")
-(CAIRO-FUNC-912 "guint cairo_device_get_reference_count cairo_device_t* device")
-(CAIRO-FUNC-912 "void* cairo_device_get_user_data cairo_device_t* device cairo_user_data_key_t* key")
-(CAIRO-FUNC-912 "cairo_status_t cairo_device_set_user_data cairo_device_t* device cairo_user_data_key_t* key void* user_data cairo_destroy_func_t destroy")
-(CAIRO-FUNC-912 "cairo_surface_t* cairo_surface_create_for_rectangle cairo_surface_t* target double x double y double width double height")
-(CAIRO-FUNC-912 "cairo_device_t* cairo_surface_get_device cairo_surface_t* surface")
-;;; stupid types (CAIRO-FUNC-912 "void cairo_surface_get_mime_data cairo_surface_t* surface char* mime_type guchar** [data] gulong* [length]" 'const)
-(CAIRO-FUNC-912 "cairo_status_t cairo_surface_set_mime_data cairo_surface_t* surface char* mime_type guchar* data gulong length cairo_destroy_func_t destroy void* closure" 'const)
-(CAIRO-FUNC-912 "cairo_surface_t* cairo_recording_surface_create cairo_content_t content cairo_rectangle_t* extents")
-(CAIRO-FUNC-912 "void cairo_recording_surface_ink_extents cairo_surface_t* surface double* x0 double* y0 double* width double* height")
+(CAIRO-FUNC "cairo_bool_t cairo_in_clip cairo_t* cr double x double y")
+(CAIRO-FUNC "cairo_device_t* cairo_device_reference cairo_device_t* device")
+(CAIRO-FUNC "cairo_status_t cairo_device_status cairo_device_t* device")
+(CAIRO-FUNC "cairo_status_t cairo_device_acquire cairo_device_t* device")
+(CAIRO-FUNC "void cairo_device_release cairo_device_t* device")
+(CAIRO-FUNC "void cairo_device_flush cairo_device_t* device")
+(CAIRO-FUNC "void cairo_device_finish cairo_device_t* device")
+(CAIRO-FUNC "void cairo_device_destroy cairo_device_t* device")
+(CAIRO-FUNC "guint cairo_device_get_reference_count cairo_device_t* device")
+(CAIRO-FUNC "void* cairo_device_get_user_data cairo_device_t* device cairo_user_data_key_t* key")
+(CAIRO-FUNC "cairo_status_t cairo_device_set_user_data cairo_device_t* device cairo_user_data_key_t* key void* user_data cairo_destroy_func_t destroy")
+(CAIRO-FUNC "cairo_surface_t* cairo_surface_create_for_rectangle cairo_surface_t* target double x double y double width double height")
+(CAIRO-FUNC "cairo_device_t* cairo_surface_get_device cairo_surface_t* surface")
+;;; stupid types (CAIRO-FUNC "void cairo_surface_get_mime_data cairo_surface_t* surface char* mime_type guchar** [data] gulong* [length]" 'const)
+(CAIRO-FUNC "cairo_status_t cairo_surface_set_mime_data cairo_surface_t* surface char* mime_type guchar* data gulong length cairo_destroy_func_t destroy void* closure" 'const)
+(CAIRO-FUNC "cairo_surface_t* cairo_recording_surface_create cairo_content_t content cairo_rectangle_t* extents")
+(CAIRO-FUNC "void cairo_recording_surface_ink_extents cairo_surface_t* surface double* x0 double* y0 double* width double* height")
 ;;; out in 1.10.0?
-;;; (CAIRO-FUNC-912 "cairo_surface_t* cairo_tee_surface_create cairo_surface_t* master")
-;;; (CAIRO-FUNC-912 "void cairo_tee_surface_add cairo_surface_t* surface cairo_surface_t* target")
-;;; (CAIRO-FUNC-912 "void cairo_tee_surface_remove cairo_surface_t* surface cairo_surface_t* target")
-;;; (CAIRO-FUNC-912 "cairo_surface_t* cairo_tee_surface_index cairo_surface_t* surface int index")
-(CAIRO-FUNC-912 "cairo_region_t* cairo_region_create void")
-(CAIRO-FUNC-912 "cairo_region_t* cairo_region_create_rectangle cairo_rectangle_int_t* rectangle")
-(CAIRO-FUNC-912 "cairo_region_t* cairo_region_create_rectangles cairo_rectangle_int_t* rects int count")
-(CAIRO-FUNC-912 "cairo_region_t* cairo_region_copy cairo_region_t* original")
-(CAIRO-FUNC-912 "cairo_region_t* cairo_region_reference cairo_region_t* region")
-(CAIRO-FUNC-912 "void cairo_region_destroy cairo_region_t* region")
-(CAIRO-FUNC-912 "cairo_bool_t cairo_region_equal cairo_region_t* a cairo_region_t* b")
-(CAIRO-FUNC-912 "cairo_status_t cairo_region_status cairo_region_t* region")
-(CAIRO-FUNC-912 "void cairo_region_get_extents cairo_region_t* region cairo_rectangle_int_t* extents")
-(CAIRO-FUNC-912 "int cairo_region_num_rectangles cairo_region_t* region")
-(CAIRO-FUNC-912 "void cairo_region_get_rectangle cairo_region_t* region int nth cairo_rectangle_int_t* rectangle")
-(CAIRO-FUNC-912 "cairo_bool_t cairo_region_is_empty cairo_region_t* region")
-(CAIRO-FUNC-912 "cairo_region_overlap_t cairo_region_contains_rectangle cairo_region_t* region cairo_rectangle_int_t* rectangle")
-(CAIRO-FUNC-912 "cairo_bool_t cairo_region_contains_point cairo_region_t* region int x int y")
-(CAIRO-FUNC-912 "void cairo_region_translate cairo_region_t* region int dx int dy")
-(CAIRO-FUNC-912 "cairo_status_t cairo_region_subtract cairo_region_t* dst cairo_region_t* other")
-(CAIRO-FUNC-912 "cairo_status_t cairo_region_subtract_rectangle cairo_region_t* dst cairo_rectangle_int_t* rectangle")
-(CAIRO-FUNC-912 "cairo_status_t cairo_region_intersect cairo_region_t* dst cairo_region_t* other")
-(CAIRO-FUNC-912 "cairo_status_t cairo_region_intersect_rectangle cairo_region_t* dst cairo_rectangle_int_t* rectangle")
-(CAIRO-FUNC-912 "cairo_status_t cairo_region_union cairo_region_t* dst cairo_region_t* other")
-(CAIRO-FUNC-912 "cairo_status_t cairo_region_union_rectangle cairo_region_t* dst cairo_rectangle_int_t* rectangle")
-(CAIRO-FUNC-912 "cairo_status_t cairo_region_xor cairo_region_t* dst cairo_region_t* other")
-(CAIRO-FUNC-912 "cairo_status_t cairo_region_xor_rectangle cairo_region_t* dst cairo_rectangle_int_t* rectangle")
+;;; (CAIRO-FUNC "cairo_surface_t* cairo_tee_surface_create cairo_surface_t* master")
+;;; (CAIRO-FUNC "void cairo_tee_surface_add cairo_surface_t* surface cairo_surface_t* target")
+;;; (CAIRO-FUNC "void cairo_tee_surface_remove cairo_surface_t* surface cairo_surface_t* target")
+;;; (CAIRO-FUNC "cairo_surface_t* cairo_tee_surface_index cairo_surface_t* surface int index")
+(CAIRO-FUNC "cairo_region_t* cairo_region_create void")
+(CAIRO-FUNC "cairo_region_t* cairo_region_create_rectangle cairo_rectangle_int_t* rectangle")
+(CAIRO-FUNC "cairo_region_t* cairo_region_create_rectangles cairo_rectangle_int_t* rects int count")
+(CAIRO-FUNC "cairo_region_t* cairo_region_copy cairo_region_t* original")
+(CAIRO-FUNC "cairo_region_t* cairo_region_reference cairo_region_t* region")
+(CAIRO-FUNC "void cairo_region_destroy cairo_region_t* region")
+(CAIRO-FUNC "cairo_bool_t cairo_region_equal cairo_region_t* a cairo_region_t* b")
+(CAIRO-FUNC "cairo_status_t cairo_region_status cairo_region_t* region")
+(CAIRO-FUNC "void cairo_region_get_extents cairo_region_t* region cairo_rectangle_int_t* extents")
+(CAIRO-FUNC "int cairo_region_num_rectangles cairo_region_t* region")
+(CAIRO-FUNC "void cairo_region_get_rectangle cairo_region_t* region int nth cairo_rectangle_int_t* rectangle")
+(CAIRO-FUNC "cairo_bool_t cairo_region_is_empty cairo_region_t* region")
+(CAIRO-FUNC "cairo_region_overlap_t cairo_region_contains_rectangle cairo_region_t* region cairo_rectangle_int_t* rectangle")
+(CAIRO-FUNC "cairo_bool_t cairo_region_contains_point cairo_region_t* region int x int y")
+(CAIRO-FUNC "void cairo_region_translate cairo_region_t* region int dx int dy")
+(CAIRO-FUNC "cairo_status_t cairo_region_subtract cairo_region_t* dst cairo_region_t* other")
+(CAIRO-FUNC "cairo_status_t cairo_region_subtract_rectangle cairo_region_t* dst cairo_rectangle_int_t* rectangle")
+(CAIRO-FUNC "cairo_status_t cairo_region_intersect cairo_region_t* dst cairo_region_t* other")
+(CAIRO-FUNC "cairo_status_t cairo_region_intersect_rectangle cairo_region_t* dst cairo_rectangle_int_t* rectangle")
+(CAIRO-FUNC "cairo_status_t cairo_region_union cairo_region_t* dst cairo_region_t* other")
+(CAIRO-FUNC "cairo_status_t cairo_region_union_rectangle cairo_region_t* dst cairo_rectangle_int_t* rectangle")
+(CAIRO-FUNC "cairo_status_t cairo_region_xor cairo_region_t* dst cairo_region_t* other")
+(CAIRO-FUNC "cairo_status_t cairo_region_xor_rectangle cairo_region_t* dst cairo_rectangle_int_t* rectangle")
 
 
 ;;; 2.91.1 (CINT-3.0 "GTK_WRAP_ALLOCATE_FREE" "GtkWrapAllocationMode")