* Patch from Paul Ishenin, adding gtk 2.6 symbols

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@11618 3ad0048d-3df7-0310-abae-a5850022a9f2

32 files changed, 667 insertions, 69 deletions

diff --git a/packages/gtk2/src/gtk+/gtk/gtkaboutdialog.inc b/packages/gtk2/src/gtk+/gtk/gtkaboutdialog.inc
new file mode 100644
index 0000000000..4b2d7a0d48
--- /dev/null
+++ b/packages/gtk2/src/gtk+/gtk/gtkaboutdialog.inc
@@ -0,0 +1,114 @@
+// included by gtk2.pas
+
+{$IFDEF read_forward_definitions}
+{$ENDIF read_forward_definitions}
+
+//------------------------------------------------------------------------------
+
+{$IFDEF read_interface_types}
+  PGtkAboutDialog = ^TGtkAboutDialog;
+  TGtkAboutDialog = record
+       parent_instance : TGtkDialog;
+       private_data : gpointer;
+    end;
+
+
+  PGtkAboutDialogClass = ^TGtkAboutDialogClass;
+  TGtkAboutDialogClass = record
+       parent_class : TGtkDialogClass;
+       _gtk_reserved1 : procedure ;cdecl;
+       _gtk_reserved2 : procedure ;cdecl;
+       _gtk_reserved3 : procedure ;cdecl;
+       _gtk_reserved4 : procedure ;cdecl;
+    end;
+
+    TGtkAboutDialogActivateLinkFunc = procedure (about:PGtkAboutDialog; link_:Pgchar; data:gpointer);cdecl;
+{$ENDIF read_interface_types}
+
+//------------------------------------------------------------------------------
+
+{$IFDEF read_interface_rest}
+function GTK_TYPE_ABOUT_DIALOG : GType;
+function GTK_ABOUT_DIALOG(anObject : pointer) : PGtkAboutDialog;
+function GTK_ABOUT_DIALOG_CLASS(klass : pointer) : PGtkAboutDialogClass;
+function GTK_IS_ABOUT_DIALOG(anObject: pointer) : boolean;
+function GTK_IS_ABOUT_DIALOG_CLASS(klass : pointer) : boolean;
+function GTK_ABOUT_DIALOG_GET_CLASS(obj : pointer) : PGtkAboutDialogClass;
+
+function gtk_about_dialog_get_type: GType; cdecl; external gtklib;
+function gtk_about_dialog_new:PGtkWidget;cdecl; external gtklib;
+procedure gtk_show_about_dialog(parent:PGtkWindow; first_property_name:Pgchar);varargs;cdecl; external gtklib;
+
+{$ifndef GTK_DISABLE_DEPRECATED}
+function gtk_about_dialog_get_name(about:PGtkAboutDialog): Pgchar;cdecl; external gtklib;
+procedure gtk_about_dialog_set_name(about:PGtkAboutDialog; name:Pgchar);cdecl; external gtklib;
+{$endif}
+
+function gtk_about_dialog_get_program_name(about:PGtkAboutDialog):Pgchar;cdecl; external gtklib;
+procedure gtk_about_dialog_set_program_name(about:PGtkAboutDialog; name:Pgchar);cdecl; external gtklib;
+function gtk_about_dialog_get_version(about:PGtkAboutDialog):Pgchar;cdecl; external gtklib;
+procedure gtk_about_dialog_set_version(about:PGtkAboutDialog; version:Pgchar);cdecl; external gtklib;
+function gtk_about_dialog_get_copyright(about:PGtkAboutDialog):Pgchar;cdecl; external gtklib;
+procedure gtk_about_dialog_set_copyright(about:PGtkAboutDialog; copyright:Pgchar);cdecl;external;
+function gtk_about_dialog_get_comments(about:PGtkAboutDialog):Pgchar;cdecl;external;
+procedure gtk_about_dialog_set_comments(about:PGtkAboutDialog; comments:Pgchar);cdecl;external;
+function gtk_about_dialog_get_license(about:PGtkAboutDialog):Pgchar;cdecl;external;
+procedure gtk_about_dialog_set_license(about:PGtkAboutDialog; license:Pgchar);cdecl;external;
+function gtk_about_dialog_get_wrap_license(about:PGtkAboutDialog):gboolean;cdecl;external;
+procedure gtk_about_dialog_set_wrap_license(about:PGtkAboutDialog; wrap_license:gboolean);cdecl;external;
+function gtk_about_dialog_get_website(about:PGtkAboutDialog):Pgchar;cdecl;external;
+procedure gtk_about_dialog_set_website(about:PGtkAboutDialog; website:Pgchar);cdecl;external;
+function gtk_about_dialog_get_website_label(about:PGtkAboutDialog):Pgchar;cdecl;external;
+procedure gtk_about_dialog_set_website_label(about:PGtkAboutDialog; website_label:Pgchar);cdecl;external;
+function gtk_about_dialog_get_authors(about:PGtkAboutDialog):PPgchar;cdecl;external;
+procedure gtk_about_dialog_set_authors(about:PGtkAboutDialog; authors:PPgchar);cdecl;external;
+function gtk_about_dialog_get_documenters(about:PGtkAboutDialog):PPgchar;cdecl;external;
+procedure gtk_about_dialog_set_documenters(about:PGtkAboutDialog; documenters:PPgchar);cdecl;external;
+function gtk_about_dialog_get_artists(about:PGtkAboutDialog):PPgchar;cdecl;external;
+procedure gtk_about_dialog_set_artists(about:PGtkAboutDialog; artists:PPgchar);cdecl;external;
+function gtk_about_dialog_get_translator_credits(about:PGtkAboutDialog):Pgchar;cdecl;external;
+procedure gtk_about_dialog_set_translator_credits(about:PGtkAboutDialog; translator_credits:Pgchar);cdecl;external;
+function gtk_about_dialog_get_logo(about:PGtkAboutDialog):PGdkPixbuf;cdecl;external;
+procedure gtk_about_dialog_set_logo(about:PGtkAboutDialog; logo:PGdkPixbuf);cdecl;external;
+function gtk_about_dialog_get_logo_icon_name(about:PGtkAboutDialog):Pgchar;cdecl;external;
+procedure gtk_about_dialog_set_logo_icon_name(about:PGtkAboutDialog; icon_name:Pgchar);cdecl;external;
+
+function gtk_about_dialog_set_email_hook(func:TGtkAboutDialogActivateLinkFunc; data:gpointer; destroy:TGDestroyNotify):TGtkAboutDialogActivateLinkFunc;cdecl; external gtklib;
+function gtk_about_dialog_set_url_hook(func:TGtkAboutDialogActivateLinkFunc; data:gpointer; destroy:TGDestroyNotify):TGtkAboutDialogActivateLinkFunc;cdecl; external gtklib;
+{$ENDIF read_interface_rest}
+
+//------------------------------------------------------------------------------
+
+{$IFDEF read_implementation}
+function GTK_TYPE_ABOUT_DIALOG : GType;
+begin
+  GTK_TYPE_ABOUT_DIALOG:=gtk_about_dialog_get_type;
+end;
+
+function GTK_ABOUT_DIALOG(anObject : pointer) : PGtkAboutDialog;
+begin
+   GTK_ABOUT_DIALOG:=PGtkAboutDialog(G_TYPE_CHECK_INSTANCE_CAST(anObject,GTK_TYPE_ABOUT_DIALOG));
+end;
+
+function GTK_ABOUT_DIALOG_CLASS(klass : pointer) : PGtkAboutDialogClass;
+begin
+   GTK_ABOUT_DIALOG_CLASS:=PGtkAboutDialogClass(G_TYPE_CHECK_CLASS_CAST(klass,GTK_TYPE_ABOUT_DIALOG));
+end;
+
+function GTK_IS_ABOUT_DIALOG(anObject: pointer) : boolean;
+begin
+   GTK_IS_ABOUT_DIALOG:=G_TYPE_CHECK_INSTANCE_TYPE(anObject,GTK_TYPE_ABOUT_DIALOG);
+end;
+
+function GTK_IS_ABOUT_DIALOG_CLASS(klass : pointer) : boolean;
+begin
+   GTK_IS_ABOUT_DIALOG_CLASS:=G_TYPE_CHECK_CLASS_TYPE(klass,GTK_TYPE_ABOUT_DIALOG);
+end;
+
+function GTK_ABOUT_DIALOG_GET_CLASS(obj : pointer) : PGtkAboutDialogClass;
+begin
+   GTK_ABOUT_DIALOG_GET_CLASS:=PGtkAboutDialogClass(G_TYPE_INSTANCE_GET_CLASS(obj,GTK_TYPE_ABOUT_DIALOG));
+end;
+
+{$ENDIF read_implementation}
+// included by gtk2.pas
diff --git a/packages/gtk2/src/gtk+/gtk/gtkaccelgroup.inc b/packages/gtk2/src/gtk+/gtk/gtkaccelgroup.inc
index 893929074f..de979ee628 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkaccelgroup.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkaccelgroup.inc
@@ -108,6 +108,10 @@ function gtk_accelerator_get_default_mod_mask:guint; cdecl; external gtklib;
 { --- internal ---  }
 function gtk_accel_group_query(accel_group:PGtkAccelGroup; accel_key:guint; accel_mods:TGdkModifierType; n_entries:Pguint):PGtkAccelGroupEntry; cdecl; external gtklib;
 procedure _gtk_accel_group_reconnect(accel_group:PGtkAccelGroup; accel_path_quark:TGQuark); cdecl; external gtklib;
+
+{$ifdef HasGTK2_6}
+function gtk_accelerator_get_label(accelerator_key:guint; accelerator_mods:TGdkModifierType):Pgchar; cdecl; external gtklib;
+{$endif}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkaction.inc b/packages/gtk2/src/gtk+/gtk/gtkaction.inc
index 123bf39078..932d66858f 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkaction.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkaction.inc
@@ -73,6 +73,9 @@ procedure gtk_action_set_accel_group(action:PGtkAction; accel_group:PGtkAccelGro
 
 {$ifdef HasGTK2_6}
 function gtk_action_get_accel_path(action: PGtkAction): Pgchar; cdecl;external gtklib name 'gtk_action_get_accel_path';
+function gtk_action_group_translate_string(action_group:PGtkActionGroup; _string:Pgchar):Pgchar; cdecl;external gtklib;
+procedure gtk_action_set_sensitive(action:PGtkAction; sensitive:gboolean); cdecl;external gtklib;
+procedure gtk_action_set_visible(action:PGtkAction; visible:gboolean); cdecl;external gtklib;
 {$endif}
 {$endif read_interface_rest}
 
diff --git a/packages/gtk2/src/gtk+/gtk/gtkbutton.inc b/packages/gtk2/src/gtk+/gtk/gtkbutton.inc
index ac01886791..2bd30cdbb3 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkbutton.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkbutton.inc
@@ -110,6 +110,11 @@ procedure gtk_button_get_alignment(window:PGtkButton; x,y: PGFloat) cdecl; exter
 procedure gtk_button_set_alignment(window:PGtkButton; x,y: GFloat); cdecl; external gtklib;
 {$ENDIF HasGTK2_4}
 
+{$ifdef HasGTK2_6}
+function gtk_button_get_image(button:PGtkButton):PGtkWidget; cdecl; external gtklib;
+procedure gtk_button_set_image(button:PGtkButton;image:PGtkWidget); cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkcellrendererprogress.inc b/packages/gtk2/src/gtk+/gtk/gtkcellrendererprogress.inc
new file mode 100644
index 0000000000..a02580990f
--- /dev/null
+++ b/packages/gtk2/src/gtk+/gtk/gtkcellrendererprogress.inc
@@ -0,0 +1,80 @@
+// included by gtk2.pas
+
+{$IFDEF read_forward_definitions}
+{$ENDIF read_forward_definitions}
+
+//------------------------------------------------------------------------------
+
+{$IFDEF read_interface_types}
+
+    PGtkCellRendererProgress = ^TGtkCellRendererProgress;
+    TGtkCellRendererProgress = record
+        parent : TGtkCellRenderer;
+        priv : pointer;
+    end;
+
+    PGtkCellRendererProgressClass = ^TGtkCellRendererProgressClass;
+    TGtkCellRendererProgressClass = record
+       parent_class : TGtkCellRendererClass;
+       // Padding for future expansion
+       _gtk_reserved1: procedure; cdecl;
+       _gtk_reserved2: procedure; cdecl;
+       _gtk_reserved3: procedure; cdecl;
+       _gtk_reserved4: procedure; cdecl;
+    end;
+
+{$ENDIF read_interface_types}
+
+//------------------------------------------------------------------------------
+
+{$IFDEF read_interface_rest}
+
+    function GTK_TYPE_CELL_RENDERER_PROGRESS: GType;
+    function GTK_CELL_RENDERER_PROGRESS(obj: Pointer): PGtkCellRendererProgress;
+    function GTK_CELL_RENDERER_PROGRESS_CLASS(klass: pointer): PGtkCellRendererProgressClass;
+    function GTK_IS_CELL_RENDERER_PROGRESS(obj: pointer): boolean;
+    function GTK_IS_CELL_RENDERER_PROGRESS_CLASS(klass: pointer):boolean;
+    function GTK_CELL_RENDERER_PROGRESS_GET_CLASS(obj: pointer): PGtkCellRendererProgressClass;
+
+    function gtk_cell_renderer_progress_get_type:TGtkType; cdecl; external gtklib;
+    function gtk_cell_renderer_progress_new: PGtkCellRendererProgress; cdecl; external gtklib;
+
+{$ENDIF read_interface_rest}
+
+//------------------------------------------------------------------------------
+
+{$IFDEF read_implementation}
+
+    function GTK_TYPE_CELL_RENDERER_PROGRESS: GType;
+    begin
+      Result:= gtk_cell_renderer_progress_get_type ();
+    end;
+    
+    function GTK_CELL_RENDERER_PROGRESS(obj: Pointer): PGtkCellRendererProgress;
+    begin
+      Result:= PGtkCellRendererProgress(GTK_CHECK_CAST(obj, GTK_TYPE_CELL_RENDERER_PROGRESS));
+    end;
+    
+    function GTK_CELL_RENDERER_PROGRESS_CLASS(klass: pointer): PGtkCellRendererProgressClass;
+    begin
+      Result:= PGtkCellRendererProgressClass(GTK_CHECK_CLASS_CAST(klass, GTK_TYPE_CELL_RENDERER_PROGRESS));
+    end;
+     
+    function GTK_IS_CELL_RENDERER_PROGRESS(obj: pointer): boolean;
+    begin
+      Result:= GTK_CHECK_TYPE(obj, GTK_TYPE_CELL_RENDERER_PROGRESS);
+    end;
+    
+    function GTK_IS_CELL_RENDERER_PROGRESS_CLASS(klass: pointer):boolean;
+    begin
+      Result:= GTK_CHECK_CLASS_TYPE(klass, GTK_TYPE_CELL_RENDERER_PROGRESS);
+    end;
+    
+    function GTK_CELL_RENDERER_PROGRESS_GET_CLASS(obj: pointer): PGtkCellRendererProgressClass;
+    begin
+      Result:= PGtkCellRendererProgressClass(GTK_CHECK_GET_CLASS(obj, GTK_TYPE_CELL_RENDERER_PROGRESS));
+    end;
+
+
+{$ENDIF read_implementation}
+// included by gtk2.pas
diff --git a/packages/gtk2/src/gtk+/gtk/gtkcellview.inc b/packages/gtk2/src/gtk+/gtk/gtkcellview.inc
new file mode 100644
index 0000000000..ae4ea0377e
--- /dev/null
+++ b/packages/gtk2/src/gtk+/gtk/gtkcellview.inc
@@ -0,0 +1,83 @@
+// included by gtk2.pas
+
+{$IFDEF read_forward_definitions}
+{$ENDIF read_forward_definitions}
+
+//------------------------------------------------------------------------------
+
+{$IFDEF read_interface_types}
+  PGtkCellViewPrivate = pointer;
+
+  PGtkCellView = ^TGtkCellView;
+  TGtkCellView = record
+       parent_instance : TGtkWidget;
+       priv : PGtkCellViewPrivate;
+    end;
+
+  PGtkCellViewClass = ^TGtkCellViewClass;
+  TGtkCellViewClass = record
+       parent_class : TGtkWidgetClass;
+    end;
+{$ENDIF read_interface_types}
+
+//------------------------------------------------------------------------------
+
+{$IFDEF read_interface_rest}
+function GTK_TYPE_CELL_VIEW: GType;
+function GTK_CELL_VIEW(obj : pointer) : PGtkCellView;
+function GTK_CELL_VIEW_CLASS(vtable : pointer) : PGtkCellViewClass;
+function GTK_IS_CELL_VIEW(obj : pointer) : boolean;
+function GTK_IS_CELL_VIEW_CLASS(vtable : pointer) : boolean;
+function GTK_CELL_VIEW_GET_CLASS(inst : pointer) : PGtkCellViewClass;
+
+
+function gtk_cell_view_get_type: GType;cdecl;external gtklib;
+function gtk_cell_view_new:PGtkWidget;cdecl;external gtklib;
+function gtk_cell_view_new_with_text(text:Pgchar):PGtkWidget;cdecl;external gtklib;
+function gtk_cell_view_new_with_markup(markup:Pgchar):PGtkWidget;cdecl;external gtklib;
+function gtk_cell_view_new_with_pixbuf(pixbuf:PGdkPixbuf):PGtkWidget;cdecl;external gtklib;
+procedure gtk_cell_view_set_model(cell_view:PGtkCellView; model:PGtkTreeModel);cdecl;external gtklib;
+procedure gtk_cell_view_set_displayed_row(cell_view:PGtkCellView; path:PGtkTreePath);cdecl;external gtklib;
+function gtk_cell_view_get_displayed_row(cell_view:PGtkCellView):PGtkTreePath;cdecl;external gtklib;
+function gtk_cell_view_get_size_of_row(cell_view:PGtkCellView; path:PGtkTreePath; requisition:PGtkRequisition):gboolean;cdecl;external gtklib;
+procedure gtk_cell_view_set_background_color(cell_view:PGtkCellView; color:PGdkColor);cdecl;external gtklib;
+function gtk_cell_view_get_cell_renderers(cell_view:PGtkCellView):PGList;cdecl;external gtklib;
+{$ENDIF read_interface_rest}
+
+//------------------------------------------------------------------------------
+
+{$IFDEF read_implementation}
+
+
+function GTK_TYPE_CELL_VIEW: GType;
+begin
+  GTK_TYPE_CELL_VIEW:=gtk_cell_view_get_type;
+end;
+
+function GTK_CELL_VIEW(obj : pointer) : PGtkCellView;
+begin
+  GTK_CELL_VIEW:=PGtkCellView(G_TYPE_CHECK_INSTANCE_CAST(obj,GTK_TYPE_CELL_VIEW));
+end;
+
+function GTK_CELL_VIEW_CLASS(vtable : pointer) : PGtkCellViewClass;
+begin
+  GTK_CELL_VIEW_CLASS:=PGtkCellViewClass(G_TYPE_CHECK_CLASS_CAST(vtable,GTK_TYPE_CELL_VIEW));
+end;
+
+function GTK_IS_CELL_VIEW(obj : pointer) : boolean;
+begin
+  GTK_IS_CELL_VIEW:=G_TYPE_CHECK_INSTANCE_TYPE(obj,GTK_TYPE_CELL_VIEW);
+end;
+
+function GTK_IS_CELL_VIEW_CLASS(vtable : pointer) : boolean;
+begin
+  GTK_IS_CELL_VIEW_CLASS:=G_TYPE_CHECK_CLASS_TYPE(vtable,GTK_TYPE_CELL_VIEW);
+end;
+
+function GTK_CELL_VIEW_GET_CLASS(inst : pointer) : PGtkCellViewClass;
+begin
+  GTK_CELL_VIEW_GET_CLASS:=PGtkCellViewClass(G_TYPE_INSTANCE_GET_CLASS(inst,GTK_TYPE_CELL_VIEW));
+end;
+
+{$ENDIF read_implementation}
+// included by gtk2.pas
diff --git a/packages/gtk2/src/gtk+/gtk/gtkclipboard.inc b/packages/gtk2/src/gtk+/gtk/gtkclipboard.inc
index 1a01d5f287..35e0d23113 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkclipboard.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkclipboard.inc
@@ -21,6 +21,7 @@
 
    TGtkClipboardClearFunc = procedure (clipboard:PGtkClipboard; user_data_or_owner:gpointer); cdecl;
 
+   TGtkClipboardImageReceivedFunc = procedure (clipboard:PGtkClipboard;	pixbuf:PGdkPixbuf; data:gpointer); cdecl;
    TGtkClipboardTargetsReceivedFunc = procedure (clipboard:PGtkClipboard; atoms: PGdkAtom; n_atoms: gint; data: gpointer); cdecl;
 
 {$ENDIF read_interface_types}
@@ -55,6 +56,16 @@ procedure gtk_clipboard_request_targets(clipboard: PGtkClipboard; callback: TGtk
 function gtk_clipboard_wait_for_targets(clipboard: PGtkClipboard; targets: PPGdkAtom; n_targets: Pgint):gboolean; cdecl; external gtklib;
 {$endif}
 
+{$ifdef HasGTK2_6}
+procedure gtk_clipboard_request_image(clipboard:PGtkClipboard; callback:TGtkClipboardImageReceivedFunc; user_data:gpointer); cdecl; external gtklib;
+procedure gtk_clipboard_set_can_store(clipboard:PGtkClipboard; targets: PGtkTargetEntry; n_targets:gint); cdecl; external gtklib;
+procedure gtk_clipboard_set_image(clipboard:PGtkClipboard; pixbuf:PGdkPixbuf); cdecl; external gtklib;
+procedure gtk_clipboard_store(clipboard:PGtkClipboard); cdecl; external gtklib;
+function gtk_clipboard_wait_for_image(clipboard:PGtkClipboard):PGdkPixbuf; cdecl; external gtklib;
+function gtk_clipboard_wait_is_image_available(clipboard:PGtkClipboard):gboolean; cdecl; external gtklib;
+function gtk_clipboard_wait_is_target_available(clipboard:PGtkClipboard; target:TGdkAtom):gboolean; cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 // included by gtk2.pas
 
diff --git a/packages/gtk2/src/gtk+/gtk/gtkcombobox.inc b/packages/gtk2/src/gtk+/gtk/gtkcombobox.inc
index aa8c09fda7..f28125e3fa 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkcombobox.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkcombobox.inc
@@ -70,6 +70,20 @@ procedure gtk_combo_box_remove_text(combo_box:PGtkComboBox; position:gint);cdecl
 { programmatic control  }
 procedure gtk_combo_box_popup(combo_box:PGtkComboBox);cdecl;external gtklib name 'gtk_combo_box_popup';
 procedure gtk_combo_box_popdown(combo_box:PGtkComboBox);cdecl;external gtklib name 'gtk_combo_box_popdown';
+
+{$ifdef HasGTK2_6}
+function gtk_combo_box_get_active_text(combo_box:PGtkComboBox):Pgchar;cdecl;external gtklib;
+function gtk_combo_box_get_column_span_column(combo_box:PGtkComboBox):gint;cdecl;external gtklib;
+function gtk_combo_box_get_focus_on_click(combo:PGtkComboBox):gboolean;cdecl;external gtklib;
+function gtk_combo_box_get_popup_accessible(combo_box:PGtkComboBox):PAtkObject;cdecl;external gtklib;
+function gtk_combo_box_get_row_separator_func(combo_box:PGtkComboBox):TGtkTreeViewRowSeparatorFunc;cdecl;external gtklib;
+function gtk_combo_box_get_row_span_column(combo_box:PGtkComboBox):gint;cdecl;external gtklib;
+function gtk_combo_box_get_wrap_width(combo_box:PGtkComboBox):gint;cdecl;external gtklib;
+procedure gtk_combo_box_set_add_tearoffs(combo_box:PGtkComboBox; add_tearoffs:gboolean);cdecl;external gtklib;
+procedure gtk_combo_box_set_focus_on_click(combo:PGtkComboBox; focus_on_click:gboolean);cdecl;external gtklib;
+procedure gtk_combo_box_set_row_separator_func(combo_box:PGtkComboBox; func:TGtkTreeViewRowSeparatorFunc; data:gpointer; destroy:TGtkDestroyNotify);cdecl;external gtklib;
+{$endif}
+
 {$endif read_interface_rest}
 
 {$ifdef read_implementation}
diff --git a/packages/gtk2/src/gtk+/gtk/gtkdialog.inc b/packages/gtk2/src/gtk+/gtk/gtkdialog.inc
index 6aec2d3104..af6c4d07e2 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkdialog.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkdialog.inc
@@ -115,6 +115,12 @@ function gtk_dialog_get_has_separator(dialog:PGtkDialog):gboolean; cdecl; extern
 procedure gtk_dialog_response(dialog:PGtkDialog; response_id:gint); cdecl; external gtklib;
 { Returns response_id  }
 function gtk_dialog_run(dialog:PGtkDialog):gint; cdecl; external gtklib;
+
+{$ifdef HasGTK2_6}
+function gtk_alternative_dialog_button_order(screen:PGdkScreen):gboolean; cdecl; external gtklib;
+procedure gtk_dialog_set_alternative_button_order(dialog:PGtkDialog; first_response_id:gint);varargs;cdecl; external gtklib;
+procedure gtk_dialog_set_alternative_button_order_from_array(dialog:PGtkDialog; n_params:gint; new_order:Pgint);cdecl; external gtklib;
+{$endif}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkdnd.inc b/packages/gtk2/src/gtk+/gtk/gtkdnd.inc
index 38851a86dc..30c5dcde72 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkdnd.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkdnd.inc
@@ -78,6 +78,15 @@ function gtk_drag_source_get_target_list(widget: PGtkWidget):PGtkTargetList; cde
 procedure gtk_drag_source_set_target_list(widget: PGtkWidget; target_list:PGtkTargetList); cdecl; external gtklib;
 {$endif}
 
+{$ifdef HasGTK2_6}
+procedure gtk_drag_dest_add_image_targets(widget:PGtkWidget); cdecl; external gtklib;
+procedure gtk_drag_dest_add_text_targets(widget:PGtkWidget); cdecl; external gtklib;
+procedure gtk_drag_dest_add_uri_targets(widget:PGtkWidget); cdecl; external gtklib;
+procedure gtk_drag_source_add_image_targets(widget:PGtkWidget); cdecl; external gtklib;
+procedure gtk_drag_source_add_text_targets(widget:PGtkWidget); cdecl; external gtklib;
+procedure gtk_drag_source_add_uri_targets(widget:PGtkWidget); cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 // included by gtk2.pas
 
diff --git a/packages/gtk2/src/gtk+/gtk/gtkentrycompletion.inc b/packages/gtk2/src/gtk+/gtk/gtkentrycompletion.inc
index 34d9edbaed..59e1d5c71a 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkentrycompletion.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkentrycompletion.inc
@@ -60,15 +60,21 @@ procedure gtk_entry_completion_complete(completion:PGtkEntryCompletion);cdecl;ex
 
 
 procedure gtk_entry_completion_insert_action_text(completion:PGtkEntryCompletion; index:gint; text:Pgchar);cdecl;external gtklib name 'gtk_entry_completion_insert_action_text';
-
 procedure gtk_entry_completion_insert_action_markup(completion:PGtkEntryCompletion; index:gint; markup:Pgchar);cdecl;external gtklib name 'gtk_entry_completion_insert_action_markup';
-
 procedure gtk_entry_completion_delete_action(completion:PGtkEntryCompletion; index:gint);cdecl;external gtklib name 'gtk_entry_completion_delete_action';
 
-
 { convenience  }
 procedure gtk_entry_completion_set_text_column(completion:PGtkEntryCompletion; column:gint);cdecl;external gtklib name 'gtk_entry_completion_set_text_column';
 
+{$ifdef HasGTK2_6}
+function gtk_entry_completion_get_inline_completion(completion:PGtkEntryCompletion):gboolean;cdecl;external gtklib;
+function gtk_entry_completion_get_popup_completion(completion:PGtkEntryCompletion):gboolean;cdecl;external gtklib;
+function gtk_entry_completion_get_text_column(completion:PGtkEntryCompletion):gint;cdecl;external gtklib;
+procedure gtk_entry_completion_insert_prefix(completion:PGtkEntryCompletion);cdecl;external gtklib;
+procedure gtk_entry_completion_set_inline_completion(completion:PGtkEntryCompletion; inline_completion:gboolean);cdecl;external gtklib;
+procedure gtk_entry_completion_set_popup_completion(completion:PGtkEntryCompletion; popup_completion:gboolean);cdecl;external gtklib;
+{$endif}
+
 {$endif read_interface_rest}
 
 {$ifdef read_implementation}
diff --git a/packages/gtk2/src/gtk+/gtk/gtkfilechooserbutton.inc b/packages/gtk2/src/gtk+/gtk/gtkfilechooserbutton.inc
new file mode 100644
index 0000000000..4ab0d0d865
--- /dev/null
+++ b/packages/gtk2/src/gtk+/gtk/gtkfilechooserbutton.inc
@@ -0,0 +1,83 @@
+{%MainUnit gtkincludes.inc}
+
+{$IFDEF read_forward_definitions}
+{$ENDIF}
+
+{$IFDEF read_interface_types}
+  PGtkFileChooserButtonPrivate = pointer;
+  PGtkFileChooserButton = ^TGtkFileChooserButton;
+  TGtkFileChooserButton = record
+       parent : TGtkHBox;
+       priv : PGtkFileChooserButtonPrivate;
+    end;
+
+
+  PGtkFileChooserButtonClass = ^TGtkFileChooserButtonClass;
+  TGtkFileChooserButtonClass = record
+       parent_class : TGtkHBoxClass;
+       file_set : procedure (fc:PGtkFileChooserButton);cdecl;
+       __gtk_reserved1 : procedure; cdecl;
+       __gtk_reserved2 : procedure; cdecl;
+       __gtk_reserved3 : procedure; cdecl;
+       __gtk_reserved4 : procedure; cdecl;
+       __gtk_reserved5 : procedure; cdecl;
+       __gtk_reserved6 : procedure; cdecl;
+       __gtk_reserved7 : procedure; cdecl;
+    end;
+{$ENDIF}
+
+{$IFDEF read_interface_rest}
+function GTK_TYPE_FILE_CHOOSER_BUTTON : GType;
+function GTK_FILE_CHOOSER_BUTTON(anObject : pointer) : PGtkFileChooserButton;
+function GTK_FILE_CHOOSER_BUTTON_CLASS(klass : pointer) : PGtkFileChooserButtonClass;
+function GTK_IS_FILE_CHOOSER_BUTTON(anObject : pointer) : boolean;
+function GTK_IS_FILE_CHOOSER_BUTTON_CLASS(klass : pointer) : boolean;
+function GTK_FILE_CHOOSER_BUTTON_GET_CLASS(anObject : pointer) : PGtkFileChooserButtonClass;
+
+
+function gtk_file_chooser_button_get_type:GType;cdecl;external gtklib;
+function gtk_file_chooser_button_new(title:Pgchar; action:TGtkFileChooserAction):PGtkWidget;cdecl;external gtklib;
+function gtk_file_chooser_button_new_with_backend(title:Pgchar; action:TGtkFileChooserAction; backend:Pgchar):PGtkWidget;cdecl;external gtklib;
+function gtk_file_chooser_button_new_with_dialog(dialog:PGtkWidget):PGtkWidget;cdecl;external gtklib;
+function gtk_file_chooser_button_get_title(button:PGtkFileChooserButton):Pgchar;cdecl;external gtklib;
+procedure gtk_file_chooser_button_set_title(button:PGtkFileChooserButton; title:Pgchar);cdecl;external gtklib;
+function gtk_file_chooser_button_get_width_chars(button:PGtkFileChooserButton):gint;cdecl;external gtklib;
+procedure gtk_file_chooser_button_set_width_chars(button:PGtkFileChooserButton; n_chars:gint);cdecl;external gtklib;
+function gtk_file_chooser_button_get_focus_on_click(button:PGtkFileChooserButton):gboolean;cdecl;external gtklib;
+procedure gtk_file_chooser_button_set_focus_on_click(button:PGtkFileChooserButton; focus_on_click:gboolean);cdecl;external gtklib;
+{$ENDIF}
+
+{************************************************}
+
+{$IFDEF read_implementation}
+function GTK_TYPE_FILE_CHOOSER_BUTTON : GType;
+begin
+  GTK_TYPE_FILE_CHOOSER_BUTTON:=gtk_file_chooser_button_get_type;
+end;
+
+function GTK_FILE_CHOOSER_BUTTON(anObject : pointer) : PGtkFileChooserButton;
+begin
+  GTK_FILE_CHOOSER_BUTTON:=PGtkFileChooserButton(G_TYPE_CHECK_INSTANCE_CAST(anObject,GTK_TYPE_FILE_CHOOSER_BUTTON));
+end;
+
+function GTK_FILE_CHOOSER_BUTTON_CLASS(klass : pointer) : PGtkFileChooserButtonClass;
+begin
+  GTK_FILE_CHOOSER_BUTTON_CLASS:=PGtkFileChooserButtonClass(G_TYPE_CHECK_CLASS_CAST(klass,GTK_TYPE_FILE_CHOOSER_BUTTON));
+end;
+
+function GTK_IS_FILE_CHOOSER_BUTTON(anObject : pointer) : boolean;
+begin
+  GTK_IS_FILE_CHOOSER_BUTTON:=G_TYPE_CHECK_INSTANCE_TYPE(anObject,GTK_TYPE_FILE_CHOOSER_BUTTON);
+end;
+
+function GTK_IS_FILE_CHOOSER_BUTTON_CLASS(klass : pointer) : boolean;
+begin
+  GTK_IS_FILE_CHOOSER_BUTTON_CLASS:=G_TYPE_CHECK_CLASS_TYPE(klass,GTK_TYPE_FILE_CHOOSER_BUTTON);
+end;
+
+function GTK_FILE_CHOOSER_BUTTON_GET_CLASS(anObject : pointer) : PGtkFileChooserButtonClass;
+begin
+  GTK_FILE_CHOOSER_BUTTON_GET_CLASS:=PGtkFileChooserButtonClass(G_TYPE_INSTANCE_GET_CLASS(anObject,GTK_TYPE_FILE_CHOOSER_BUTTON));
+end;
+
+{$ENDIF} {read_implementation}
diff --git a/packages/gtk2/src/gtk+/gtk/gtkfilechooserdialog.inc b/packages/gtk2/src/gtk+/gtk/gtkfilechooserdialog.inc
index 33c4f1916f..a18f750bfe 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkfilechooserdialog.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkfilechooserdialog.inc
@@ -3,18 +3,16 @@
 {$ENDIF}
 
 {$IFDEF read_interface_types}
-type
-   PGtkFileChooserDialogClass = ^TGtkFileChooserDialogClass;
-   TGtkFileChooserDialogClass = record
-        parent_class : TGtkDialogClass;
-     end;
-
-   PGtkFileChooserDialog = ^TGtkFileChooserDialog;
-   TGtkFileChooserDialog = record
-        parent_instance : TGtkDialog;
-        priv : PGtkFileChooserDialogPrivate;
-     end;
-
+  PGtkFileChooserDialogClass = ^TGtkFileChooserDialogClass;
+  TGtkFileChooserDialogClass = record
+    parent_class : TGtkDialogClass;
+  end;
+
+  PGtkFileChooserDialog = ^TGtkFileChooserDialog;
+  TGtkFileChooserDialog = record
+    parent_instance : TGtkDialog;
+    priv : PGtkFileChooserDialogPrivate;
+  end;
 {$ENDIF} {types}
 
 {$IFDEF read_interface_rest}
diff --git a/packages/gtk2/src/gtk+/gtk/gtkfilechooserprivate.inc b/packages/gtk2/src/gtk+/gtk/gtkfilechooserprivate.inc
index 18b9fd0bd7..3ab3bc1b45 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkfilechooserprivate.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkfilechooserprivate.inc
@@ -1,12 +1,10 @@
 
 {$IFDEF read_forward_definitions}
-{$ENDIF}
-
-{$IFDEF read_interface_types}
-type
    PGtkFileChooserDialogPrivate = pointer;
    PPGtkFileChooserDialogPrivate = ^PGtkFileChooserDialogPrivate;
+{$ENDIF}
 
+{$IFDEF read_interface_types}
    PGtkFileChooserIface = ^TGtkFileChooserIface;
    TGtkFileChooserIface = record
         base_iface : TGTypeInterface;
diff --git a/packages/gtk2/src/gtk+/gtk/gtkfilefilter.inc b/packages/gtk2/src/gtk+/gtk/gtkfilefilter.inc
index 14153c48a9..6acf200ef1 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkfilefilter.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkfilefilter.inc
@@ -46,6 +46,10 @@ function gtk_file_filter_get_needed(filter:PGtkFileFilter):TGtkFileFilterFlags;c
 
 function gtk_file_filter_filter(filter:PGtkFileFilter; filter_info:PGtkFileFilterInfo):gboolean;cdecl;external gtklib name 'gtk_file_filter_filter';
 
+{$ifdef HasGTK2_6}
+procedure gtk_file_filter_add_pixbuf_formats(filter:PGtkFileFilter);cdecl;external gtklib;
+{$endif}
+
 {$endif}
 
 {$ifdef read_implementation}
diff --git a/packages/gtk2/src/gtk+/gtk/gtkicontheme.inc b/packages/gtk2/src/gtk+/gtk/gtkicontheme.inc
index b32dd6e112..fb06242436 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkicontheme.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkicontheme.inc
@@ -116,6 +116,10 @@ function gtk_icon_info_get_embedded_rect(icon_info:PGtkIconInfo; rectangle:PGdkR
 function gtk_icon_info_get_attach_points(icon_info:PGtkIconInfo; points:PPGdkPoint; n_points:Pgint):gboolean;cdecl;external gtklib name 'gtk_icon_info_get_attach_points';
 function gtk_icon_info_get_display_name(icon_info:PGtkIconInfo):Pgchar;cdecl;external gtklib name 'gtk_icon_info_get_display_name';
 
+{$ifdef HasGTK2_6}
+function gtk_icon_theme_get_icon_sizes(icon_theme:PGtkIconTheme; icon_name:Pgchar):Pgint;cdecl;external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 {$ifdef read_implementation}
diff --git a/packages/gtk2/src/gtk+/gtk/gtkimage.inc b/packages/gtk2/src/gtk+/gtk/gtkimage.inc
index 43569ecc3d..efbd505f2d 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkimage.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkimage.inc
@@ -126,6 +126,15 @@ procedure gtk_image_set(image:PGtkImage; val:PGdkImage; mask:PGdkBitmap); cdecl;
 procedure gtk_image_get(image:PGtkImage; var val:PGdkImage; var mask:PGdkBitmap); cdecl; external gtklib;
 {$endif}
 { GTK_DISABLE_DEPRECATED  }
+
+{$ifdef HasGTK2_6}
+procedure gtk_image_get_icon_name(image:PGtkImage; icon_name:PPgchar; size:PGtkIconSize); cdecl; external gtklib;
+function gtk_image_get_pixel_size(image:PGtkImage):gint; cdecl; external gtklib;
+function gtk_image_new_from_icon_name(icon_name:Pgchar; size:TGtkIconSize):PGtkWidget; cdecl; external gtklib;
+procedure gtk_image_set_from_icon_name(image:PGtkImage; icon_name:Pgchar; size:TGtkIconSize); cdecl; external gtklib;
+procedure gtk_image_set_pixel_size(image:PGtkImage; pixel_size:gint); cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkincludes.inc b/packages/gtk2/src/gtk+/gtk/gtkincludes.inc
index 14dad852ab..682aeb5266 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkincludes.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkincludes.inc
@@ -154,28 +154,14 @@
 {$include gtkfilesystem.inc}
 
 // new GtkFileChooser Widget
-{$IFDEF HasGTK2_6}
-{$IFNDEF HasGTK2_8} // These functions are removed from GTK-2.8
+{$include gtkfilechooser.inc}
 {$include gtkfilechooserdefault.inc}
+{$include gtkfilechooserdialog.inc}
 {$include gtkfilechooserembed.inc}
 {$include gtkfilechooserentry.inc}
-{$include gtkiconview.inc}
-{$ENDIF HasGTK2_8}
-
-// new GtkCellRendererCombo widget
-{$include gtkcellrenderercombo.inc}
-{$ENDIF HasGTK2_6}
-
-{$IFDEF HasGTK2_8}
-// Put new GTK-2.8 functions here
-{$ENDIF HasGTK2_8}
-
-{$include gtkfilechooser.inc}
-
 {$include gtkfilechooserprivate.inc}
 {$include gtkfilechooserutils.inc}
 {$include gtkfilechooserwidget.inc}
-{$include gtkfilechooserdialog.inc}
 
 // GtkExpander
 {$include gtkexpander.inc}
@@ -206,6 +192,20 @@
 {$include gtkseparatortoolitem.inc}
 {$include gtktreemodelfilter.inc}
 
+{$IFDEF HasGTK2_6}
+{$include gtkaboutdialog.inc}
+{$include gtkcellrenderercombo.inc} // new GtkCellRendererCombo widget
+{$include gtkcellrendererprogress.inc}
+{$include gtkcellview.inc}
+{$include gtkfilechooserbutton.inc}
+{$include gtkiconview.inc}
+{$include gtkmenutoolbutton.inc}
+
+{$IFDEF HasGTK2_8}
+// Put new GTK-2.8 functions here
+{$ENDIF HasGTK2_8}
+
+{$ENDIF HasGTK2_6}
 
 {$endif HasGTK2_4}
 
diff --git a/packages/gtk2/src/gtk+/gtk/gtklabel.inc b/packages/gtk2/src/gtk+/gtk/gtklabel.inc
index 0c957e516a..9fb8c7f9c4 100644
--- a/packages/gtk2/src/gtk+/gtk/gtklabel.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtklabel.inc
@@ -106,15 +106,23 @@ procedure gtk_label_get_layout_offsets(_label:PGtkLabel; x:Pgint; y:Pgint); cdec
 
 {$ifndef GTK_DISABLE_DEPRECATED}
 procedure gtk_label_set(_label:PGtkLabel; str:Pchar);
-
 procedure gtk_label_get(_label:PGtkLabel; str:PPchar); cdecl; external gtklib;
-{ Convenience function to set the name and pattern by parsing
-   a string with embedded underscores, and return the appropriate
-   key symbol for the accelerator.
-  }
 function gtk_label_parse_uline(_label:PGtkLabel; _string:Pgchar):guint; cdecl; external gtklib;
 {$endif}
-{ GTK_DISABLE_DEPRECATED  }
+
+{$ifdef HasGTK2_6}
+function gtk_label_get_angle(_label:PGtkLabel):gdouble;cdecl; external gtklib;
+function gtk_label_get_ellipsize(_label:PGtkLabel):TPangoEllipsizeMode;cdecl; external gtklib;
+function gtk_label_get_max_width_chars(_label:PGtkLabel):gint;cdecl; external gtklib;
+function gtk_label_get_single_line_mode(_label:PGtkLabel):gboolean;cdecl; external gtklib;
+function gtk_label_get_width_chars(_label:PGtkLabel):gint;cdecl; external gtklib;
+procedure gtk_label_set_angle(_label:PGtkLabel; angle:gdouble);cdecl; external gtklib;
+procedure gtk_label_set_ellipsize(_label:PGtkLabel; mode:TPangoEllipsizeMode);cdecl; external gtklib;
+procedure gtk_label_set_max_width_chars(_label:PGtkLabel; n_chars:gint);cdecl; external gtklib;
+procedure gtk_label_set_single_line_mode(_label:PGtkLabel; single_line_mode:gboolean);cdecl; external gtklib;
+procedure gtk_label_set_width_chars(_label:PGtkLabel; n_chars:gint);cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkliststore.inc b/packages/gtk2/src/gtk+/gtk/gtkliststore.inc
index b37fbcc0d3..193f511210 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkliststore.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkliststore.inc
@@ -87,6 +87,12 @@ procedure gtk_list_store_move_before(list_store:PGtkListStore; iter:PGtkTreeIter
 procedure gtk_list_store_reorder(list_store:PGtkListStore; new_order:Pgint); cdecl; external gtklib;
 procedure gtk_list_store_swap(list_store:PGtkListStore; a:PGtkTreeIter; b:PGtkTreeIter); cdecl; external gtklib; 
 {$ENDIF}
+
+{$ifdef HasGTK2_6}
+procedure gtk_list_store_insert_with_values(list_store:PGtkListStore; iter:PGtkTreeIter; position:gint); varargs;cdecl; external gtklib; 
+procedure gtk_list_store_insert_with_valuesv(list_store:PGtkListStore; iter:PGtkTreeIter; position:gint; columns:Pgint; values:PGValue; n_values:gint);cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkmain.inc b/packages/gtk2/src/gtk+/gtk/gtkmain.inc
index fbc8cfaac7..731ecd1465 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkmain.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkmain.inc
@@ -122,6 +122,13 @@ procedure gtk_propagate_event(widget:PGtkWidget; event:PGdkEvent); cdecl; extern
 function _gtk_boolean_handled_accumulator(ihint:PGSignalInvocationHint; return_accu:PGValue; handler_return:PGValue; dummy:gpointer):gboolean; cdecl; external gtklib;
 function _gtk_find_module(name:Pgchar; _type:Pgchar):Pgchar; cdecl; external gtklib;
 function _gtk_get_module_path(_type:Pgchar):PPgchar; cdecl; external gtklib;
+
+{$ifdef HasGTK2_6}
+function gtk_get_option_group(open_default_display:gboolean):PGOptionGroup; cdecl; external gtklib;
+function gtk_init_with_args(argc:PLongint; argv:PPPchar; parameter_string:Pchar; 
+  entries:PGOptionEntry; translation_domain:Pchar; error:PPGError):gboolean; cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkmenu.inc b/packages/gtk2/src/gtk+/gtk/gtkmenu.inc
index cbd2e8384e..28e90644a2 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkmenu.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkmenu.inc
@@ -163,6 +163,10 @@ procedure gtk_menu_attach(menu: PGtkMenu; child: PGtkWidget; left_attach: guint;
 procedure gtk_menu_set_monitor(menu: PGtkMenu; monitor_num: gint); cdecl; external gtklib;
 {$endif}
 
+{$ifdef HasGTK2_6}
+function gtk_menu_get_for_attach_widget(widget:PGtkWidget):PGList; cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkmenutoolbutton.inc b/packages/gtk2/src/gtk+/gtk/gtkmenutoolbutton.inc
new file mode 100644
index 0000000000..84fbae817e
--- /dev/null
+++ b/packages/gtk2/src/gtk+/gtk/gtkmenutoolbutton.inc
@@ -0,0 +1,86 @@
+// included by gtk2.pas
+
+{$IFDEF read_forward_definitions}
+{$ENDIF read_forward_definitions}
+
+//------------------------------------------------------------------------------
+
+{$IFDEF read_interface_types}
+  PGtkMenuToolButtonPrivate = pointer;
+
+  PGtkMenuToolButton = ^TGtkMenuToolButton;
+  TGtkMenuToolButton = record
+    parent : TGtkToolButton;
+    priv : PGtkMenuToolButtonPrivate;
+  end;
+
+
+  PGtkMenuToolButtonClass = ^TGtkMenuToolButtonClass;
+  TGtkMenuToolButtonClass = record
+    parent_class : TGtkToolButtonClass;
+    show_menu : procedure (button:PGtkMenuToolButton);cdecl;
+    _gtk_reserved1 : procedure ; cdecl;
+    _gtk_reserved2 : procedure ; cdecl;
+    _gtk_reserved3 : procedure ; cdecl;
+    _gtk_reserved4 : procedure ; cdecl;
+  end;
+{$ENDIF read_interface_types}
+
+//------------------------------------------------------------------------------
+
+{$IFDEF read_interface_rest}
+function GTK_TYPE_MENU_TOOL_BUTTON : GType;
+function GTK_MENU_TOOL_BUTTON(o : pointer): PGtkMenuToolButton;
+function GTK_MENU_TOOL_BUTTON_CLASS(k : pointer) : PGtkMenuToolButtonClass;
+function GTK_IS_MENU_TOOL_BUTTON(o : pointer) : boolean;
+function GTK_IS_MENU_TOOL_BUTTON_CLASS(k : pointer) : boolean;
+function GTK_MENU_TOOL_BUTTON_GET_CLASS(o : pointer) : PGtkMenuToolButtonClass;
+
+function gtk_menu_tool_button_get_type:GType;cdecl;external gtklib;
+function gtk_menu_tool_button_new(icon_widget:PGtkWidget; _label:Pgchar):PGtkToolItem;cdecl;external gtklib;
+function gtk_menu_tool_button_new_from_stock(stock_id:Pgchar):PGtkToolItem;cdecl;external gtklib;
+procedure gtk_menu_tool_button_set_menu(button:PGtkMenuToolButton; menu:PGtkWidget);cdecl;external gtklib;
+function gtk_menu_tool_button_get_menu(button:PGtkMenuToolButton):PGtkWidget;cdecl;external gtklib;
+
+{$ifndef GTK_DISABLE_DEPRECATED}
+procedure gtk_menu_tool_button_set_arrow_tooltip(button:PGtkMenuToolButton; tooltips:PGtkTooltips; tip_text:Pgchar; tip_private:Pgchar);cdecl;external gtklib;
+{$endif}
+
+procedure gtk_menu_tool_button_set_arrow_tooltip_text(button:PGtkMenuToolButton; text:Pgchar);cdecl;external gtklib;
+procedure gtk_menu_tool_button_set_arrow_tooltip_markup(button:PGtkMenuToolButton; markup:Pgchar);cdecl;external gtklib;
+
+{$ENDIF read_interface_rest}
+//------------------------------------------------------------------------------
+
+{$IFDEF read_implementation}
+function GTK_TYPE_MENU_TOOL_BUTTON : GType;
+begin
+  GTK_TYPE_MENU_TOOL_BUTTON:=gtk_menu_tool_button_get_type;
+end;
+
+function GTK_MENU_TOOL_BUTTON(o : pointer) : PGtkMenuToolButton;
+begin
+  GTK_MENU_TOOL_BUTTON:=PGtkMenuToolButton(G_TYPE_CHECK_INSTANCE_CAST(o,GTK_TYPE_MENU_TOOL_BUTTON));
+end;
+
+function GTK_MENU_TOOL_BUTTON_CLASS(k : pointer) : PGtkMenuToolButtonClass;
+begin
+  GTK_MENU_TOOL_BUTTON_CLASS:=PGtkMenuToolButtonClass(G_TYPE_CHECK_CLASS_CAST(k,GTK_TYPE_MENU_TOOL_BUTTON));
+end;
+
+function GTK_IS_MENU_TOOL_BUTTON(o : pointer) : boolean;
+begin
+  GTK_IS_MENU_TOOL_BUTTON:=G_TYPE_CHECK_INSTANCE_TYPE(o,GTK_TYPE_MENU_TOOL_BUTTON);
+end;
+
+function GTK_IS_MENU_TOOL_BUTTON_CLASS(k : pointer) : boolean;
+begin
+  GTK_IS_MENU_TOOL_BUTTON_CLASS:=G_TYPE_CHECK_CLASS_TYPE(k,GTK_TYPE_MENU_TOOL_BUTTON);
+end;
+
+function GTK_MENU_TOOL_BUTTON_GET_CLASS(o : pointer) : PGtkMenuToolButtonClass;
+begin
+  GTK_MENU_TOOL_BUTTON_GET_CLASS:=PGtkMenuToolButtonClass(G_TYPE_INSTANCE_GET_CLASS(o,GTK_TYPE_MENU_TOOL_BUTTON));
+end;
+{$ENDIF read_implementation}
+// included by gtk2.pas
diff --git a/packages/gtk2/src/gtk+/gtk/gtkmessagedialog.inc b/packages/gtk2/src/gtk+/gtk/gtkmessagedialog.inc
index 3f6b1701c0..b58642583e 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkmessagedialog.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkmessagedialog.inc
@@ -77,6 +77,11 @@ function gtk_message_dialog_new_with_markup(parent: PGtkWindow; flags: TGtkDialo
 procedure gtk_message_dialog_set_markup(message_dialog: PGtkMessageDialog; str:Pgchar); cdecl; external gtklib;
 {$endif}
 
+{$ifdef HasGTK2_6}
+procedure gtk_message_dialog_format_secondary_markup(message_dialog:PGtkMessageDialog; message_format:Pgchar); varargs;cdecl; external gtklib;
+procedure gtk_message_dialog_format_secondary_text(message_dialog:PGtkMessageDialog; message_format:Pgchar); varargs;cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkprogressbar.inc b/packages/gtk2/src/gtk+/gtk/gtkprogressbar.inc
index d47a883477..e30152dde7 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkprogressbar.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkprogressbar.inc
@@ -104,19 +104,19 @@ function gtk_progress_bar_get_pulse_step(pbar:PGtkProgressBar):gdouble; cdecl; e
 function gtk_progress_bar_get_orientation(pbar:PGtkProgressBar):TGtkProgressBarOrientation; cdecl; external gtklib;
 
 {$ifndef GTK_DISABLE_DEPRECATED}
-{ Everything below here is deprecated  }
 function gtk_progress_bar_new_with_adjustment(adjustment:PGtkAdjustment):PGtkWidget; cdecl; external gtklib;
 procedure gtk_progress_bar_set_bar_style(pbar:PGtkProgressBar; style:TGtkProgressBarStyle); cdecl; external gtklib;
 procedure gtk_progress_bar_set_discrete_blocks(pbar:PGtkProgressBar; blocks:guint); cdecl; external gtklib;
-{ set_activity_step() is not only deprecated, it doesn't even work.
-   (Of course, it wasn't usable anyway, you had to set it from a size_allocate
-   handler or something)
-  }
 procedure gtk_progress_bar_set_activity_step(pbar:PGtkProgressBar; step:guint); cdecl; external gtklib;
 procedure gtk_progress_bar_set_activity_blocks(pbar:PGtkProgressBar; blocks:guint); cdecl; external gtklib;
 procedure gtk_progress_bar_update(pbar:PGtkProgressBar; percentage:gdouble); cdecl; external gtklib;
 {$endif}
-{ GTK_DISABLE_DEPRECATED  }
+
+{$ifdef HasGTK2_6}
+function gtk_progress_bar_get_ellipsize(pbar:PGtkProgressBar):TPangoEllipsizeMode; cdecl; external gtklib;
+procedure gtk_progress_bar_set_ellipsize(pbar:PGtkProgressBar; mode:TPangoEllipsizeMode); cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkselection.inc b/packages/gtk2/src/gtk+/gtk/gtkselection.inc
index 79f8165d79..46d9015e38 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkselection.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkselection.inc
@@ -91,6 +91,19 @@ procedure gtk_selection_data_free(data:PGtkSelectionData); cdecl; external gtkli
 function gtk_selection_clear(widget:PGtkWidget; event:PGdkEventSelection):gboolean; cdecl; external gtklib;
 function gtk_selection_owner_set_for_display(display:PGdkDisplay; widget:PGtkWidget; selection:TGdkAtom; time:guint32):gboolean; cdecl; external gtklib;
 {$ENDIF}
+
+{$ifdef HasGTK2_6}
+function gtk_selection_data_get_pixbuf(selection_data:PGtkSelectionData):PGdkPixbuf; cdecl; external gtklib;
+function gtk_selection_data_get_uris(selection_data:PGtkSelectionData):PPgchar; cdecl; external gtklib;
+function gtk_selection_data_set_pixbuf(selection_data:PGtkSelectionData; pixbuf:PGdkPixbuf):gboolean; cdecl; external gtklib;
+function gtk_selection_data_set_uris(selection_data:PGtkSelectionData; uris:PPgchar):gboolean; cdecl; external gtklib;
+function gtk_selection_data_targets_include_image(selection_data:PGtkSelectionData; writable:gboolean):gboolean; cdecl; external gtklib;
+
+procedure gtk_target_list_add_image_targets(list:PGtkTargetList; info:guint; writable:gboolean); cdecl; external gtklib;
+procedure gtk_target_list_add_text_targets(list:PGtkTargetList; info:guint); cdecl; external gtklib;
+procedure gtk_target_list_add_uri_targets(list:PGtkTargetList; info:guint); cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkstock.inc b/packages/gtk2/src/gtk+/gtk/gtkstock.inc
index 4375fbee1d..643a7014c9 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkstock.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkstock.inc
@@ -27,24 +27,30 @@ const
    GTK_STOCK_DIALOG_QUESTION = 'gtk-dialog-question';
    GTK_STOCK_DND = 'gtk-dnd';
    GTK_STOCK_DND_MULTIPLE = 'gtk-dnd-multiple';
-	 GTK_STOCK_ABOUT = 'gtk-about';
-   GTK_STOCK_ADD_name = 'gtk-add';
+   GTK_STOCK_ABOUT = 'gtk-about';
+   _GTK_STOCK_ADD = 'gtk-add';
    GTK_STOCK_APPLY = 'gtk-apply';
    GTK_STOCK_BOLD = 'gtk-bold';
    GTK_STOCK_CANCEL = 'gtk-cancel';
    GTK_STOCK_CDROM = 'gtk-cdrom';
    GTK_STOCK_CLEAR = 'gtk-clear';
    GTK_STOCK_CLOSE = 'gtk-close';
-	 GTK_STOCK_COLOR_PICKER = 'gtk-color-picker';
+   GTK_STOCK_COLOR_PICKER = 'gtk-color-picker';
    GTK_STOCK_CONVERT = 'gtk-convert';
-	 GTK_STOCK_CONNECT = 'gtk-connect';
+   GTK_STOCK_CONNECT = 'gtk-connect';
    GTK_STOCK_COPY = 'gtk-copy';
    GTK_STOCK_CUT = 'gtk-cut';
    GTK_STOCK_DELETE = 'gtk-delete';
+   GTK_STOCK_DIRECTORY = 'gtk-directory';
+   GTK_STOCK_DISCARD = 'gtk-discard';
+   GTK_STOCK_DISCONNECT = 'gtk-disconnect';
+   GTK_STOCK_EDIT = 'gtk-edit';
    GTK_STOCK_EXECUTE = 'gtk-execute';
+   GTK_STOCK_FILE = 'gtk-file';
    GTK_STOCK_FIND = 'gtk-find';
    GTK_STOCK_FIND_AND_REPLACE = 'gtk-find-and-replace';
    GTK_STOCK_FLOPPY = 'gtk-floppy';
+   GTK_STOCK_FULLSCREEN = 'gtk-fullscreen';
    GTK_STOCK_GOTO_BOTTOM = 'gtk-goto-bottom';
    GTK_STOCK_GOTO_FIRST = 'gtk-goto-first';
    GTK_STOCK_GOTO_LAST = 'gtk-goto-last';
@@ -58,6 +64,7 @@ const
    GTK_STOCK_HOME = 'gtk-home';
    GTK_STOCK_INDEX = 'gtk-index';
    GTK_STOCK_INDENT = 'gtk-indent';
+   GTK_STOCK_INFO = 'gtk-info';
    GTK_STOCK_UNINDENT = 'gtk-unindent';
    GTK_STOCK_ITALIC = 'gtk-italic';
    GTK_STOCK_JUMP_TO = 'gtk-jump-to';
@@ -65,20 +72,25 @@ const
    GTK_STOCK_JUSTIFY_FILL = 'gtk-justify-fill';
    GTK_STOCK_JUSTIFY_LEFT = 'gtk-justify-left';
    GTK_STOCK_JUSTIFY_RIGHT = 'gtk-justify-right';
-	 GTK_STOCK_MEDIA_FORWARD = 'gtk-media-forward';
-	 GTK_STOCK_MEDIA_NEXT = 'gtk-media-next';
-	 GTK_STOCK_MEDIA_PAUSE = 'gtk-media-pause';
-	 GTK_STOCK_MEDIA_PLAY = 'gtk-media-play';
-	 GTK_STOCK_MEDIA_PREVIOUS = 'gtk-media-previous';
-	 GTK_STOCK_MEDIA_RECORD = 'gtk-media-record';
-	 GTK_STOCK_MEDIA_REWIND = 'gtk-media-rewind';
-	 GTK_STOCK_MEDIA_STOP = 'gtk-media-stop';
+   GTK_STOCK_LEAVE_FULLSCREEN = 'gtk-leave-fullscreen';
    GTK_STOCK_MISSING_IMAGE = 'gtk-missing-image';
+   GTK_STOCK_MEDIA_FORWARD = 'gtk-media-forward';
+   GTK_STOCK_MEDIA_NEXT = 'gtk-media-next';
+   GTK_STOCK_MEDIA_PAUSE = 'gtk-media-pause';
+   GTK_STOCK_MEDIA_PLAY = 'gtk-media-play';
+   GTK_STOCK_MEDIA_PREVIOUS = 'gtk-media-previous';
+   GTK_STOCK_MEDIA_RECORD = 'gtk-media-record';
+   GTK_STOCK_MEDIA_REWIND = 'gtk-media-rewind';
+   GTK_STOCK_MEDIA_STOP = 'gtk-media-stop';
    GTK_STOCK_NETWORK = 'gtk-network';
    GTK_STOCK_NEW = 'gtk-new';
    GTK_STOCK_NO = 'gtk-no';
    GTK_STOCK_OK = 'gtk-ok';
    GTK_STOCK_OPEN = 'gtk-open';
+   GTK_STOCK_ORIENTATION_PORTRAIT = 'gtk-orientation-portrait';
+   GTK_STOCK_ORIENTATION_LANDSCAPE = 'gtk-orientation-landscape';
+   GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE = 'gtk-orientation-reverse-landscape';
+   GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT = 'gtk-orientation-reverse-portrait';
    GTK_STOCK_PASTE = 'gtk-paste';
    GTK_STOCK_PREFERENCES = 'gtk-preferences';
    GTK_STOCK_PRINT = 'gtk-print';
@@ -91,6 +103,7 @@ const
    GTK_STOCK_REVERT_TO_SAVED = 'gtk-revert-to-saved';
    GTK_STOCK_SAVE = 'gtk-save';
    GTK_STOCK_SAVE_AS = 'gtk-save-as';
+   GTK_STOCK_SELECT_ALL = 'gtk-select-all';
    GTK_STOCK_SELECT_COLOR = 'gtk-select-color';
    GTK_STOCK_SELECT_FONT = 'gtk-select-font';
    GTK_STOCK_SORT_ASCENDING = 'gtk-sort-ascending';
diff --git a/packages/gtk2/src/gtk+/gtk/gtktextbuffer.inc b/packages/gtk2/src/gtk+/gtk/gtktextbuffer.inc
index 1e8bfc15e0..7e12971c5b 100644
--- a/packages/gtk2/src/gtk+/gtk/gtktextbuffer.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtktextbuffer.inc
@@ -181,6 +181,10 @@ procedure _gtk_text_buffer_notify_will_remove_tag(buffer:PGtkTextBuffer; tag:PGt
 procedure gtk_text_buffer_select_range(buffer: PGtkTextBuffer; ins: PGtkTextIter; bound: PGtkTextIter); cdecl; external gtklib;
 {$endif}
 
+{$ifdef HasGTK2_6}
+function gtk_text_buffer_backspace(buffer:PGtkTextBuffer; iter:PGtkTextIter; interactive:gboolean; default_editable:gboolean):gboolean; cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtktextview.inc b/packages/gtk2/src/gtk+/gtk/gtktextview.inc
index 6c15efcc77..5200bc33e8 100644
--- a/packages/gtk2/src/gtk+/gtk/gtktextview.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtktextview.inc
@@ -250,6 +250,10 @@ procedure gtk_text_view_set_accepts_tab(text_view: PGtkTextView; accepts_tab: gb
 function  gtk_text_view_get_accepts_tab(text_view: PGtkTextView): gboolean; cdecl; external gtklib;
 {$ENDIF HasGTK2_4}
 
+{$ifdef HasGTK2_6}
+procedure gtk_text_view_get_iter_at_position(text_view:PGtkTextView; iter:PGtkTextIter; trailing:Pgint; x:gint; y:gint); cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtktoolitem.inc b/packages/gtk2/src/gtk+/gtk/gtktoolitem.inc
index 16cedc1186..25804592b8 100644
--- a/packages/gtk2/src/gtk+/gtk/gtktoolitem.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtktoolitem.inc
@@ -38,7 +38,6 @@ function GTK_TOOL_ITEM_GET_CLASS(o : pointer) : PGtkToolItemClass;
 
 
 function gtk_tool_item_get_type:GType;cdecl;external gtklib name 'gtk_tool_item_get_type';
-
 function gtk_tool_item_new:PGtkToolItem;cdecl;external gtklib name 'gtk_tool_item_new';
 
 procedure gtk_tool_item_set_homogeneous(tool_item:PGtkToolItem; homogeneous:gboolean);cdecl;external gtklib name 'gtk_tool_item_set_homogeneous';
@@ -62,24 +61,21 @@ function gtk_tool_item_get_is_important(tool_item:PGtkToolItem):gboolean;cdecl;e
 procedure gtk_tool_item_set_is_important(tool_item:PGtkToolItem; is_important:gboolean);cdecl;external gtklib name 'gtk_tool_item_set_is_important';
 
 function gtk_tool_item_get_icon_size(tool_item:PGtkToolItem):TGtkIconSize;cdecl;external gtklib name 'gtk_tool_item_get_icon_size';
-
 function gtk_tool_item_get_orientation(tool_item:PGtkToolItem):TGtkOrientation;cdecl;external gtklib name 'gtk_tool_item_get_orientation';
-
 function gtk_tool_item_get_toolbar_style(tool_item:PGtkToolItem):TGtkToolbarStyle;cdecl;external gtklib name 'gtk_tool_item_get_toolbar_style';
-
 function gtk_tool_item_get_relief_style(tool_item:PGtkToolItem):TGtkReliefStyle;cdecl;external gtklib name 'gtk_tool_item_get_relief_style';
-
 function gtk_tool_item_retrieve_proxy_menu_item(tool_item:PGtkToolItem):PGtkWidget;cdecl;external gtklib name 'gtk_tool_item_retrieve_proxy_menu_item';
 
-
 function gtk_tool_item_get_proxy_menu_item(tool_item:PGtkToolItem; menu_item_id:Pgchar):PGtkWidget;cdecl;external gtklib name 'gtk_tool_item_get_proxy_menu_item';
-
-
 procedure gtk_tool_item_set_proxy_menu_item(tool_item:PGtkToolItem; menu_item_id:Pgchar; menu_item:PGtkWidget);cdecl;external gtklib name 'gtk_tool_item_set_proxy_menu_item';
 
 { internal function  }
 procedure _gtk_tool_item_toolbar_reconfigured(tool_item:PGtkToolItem);cdecl;external gtklib name '_gtk_tool_item_toolbar_reconfigured';
 
+{$ifdef HasGTK2_6}
+procedure gtk_tool_item_rebuild_menu(tool_item:PGtkToolItem);cdecl;external gtklib;
+{$endif}
+
 {$endif read_interface_rest}
 
 {$ifdef read_implementation}
diff --git a/packages/gtk2/src/gtk+/gtk/gtktreeview.inc b/packages/gtk2/src/gtk+/gtk/gtktreeview.inc
index a5c2597409..31ecbbac3e 100644
--- a/packages/gtk2/src/gtk+/gtk/gtktreeview.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtktreeview.inc
@@ -9,8 +9,9 @@
 
    TGtkTreeViewSearchEqualFunc = function (model:PGtkTreeModel; column:gint; key:Pgchar; iter:PGtkTreeIter; search_data:gpointer):gboolean; cdecl;
 
-{ This function should really never be used.  It is just for use by ATK.
-  }
+   TGtkTreeViewRowSeparatorFunc = function (model:PGtkTreeModel; iter:PGtkTreeIter; data:gpointer):gboolean; cdecl;
+
+   // This function should really never be used.  It is just for use by ATK.
    TGtkTreeDestroyCountFunc = procedure (tree_view:PGtkTreeView; path:PGtkTreePath; children:gint; user_data:gpointer); cdecl;
 
 { drop before/after this row  }
@@ -162,6 +163,19 @@ procedure gtk_tree_view_set_destroy_count_func(tree_view:PGtkTreeView; func:TGtk
 procedure gtk_tree_view_expand_to_path(tree_view:PGtkTreeView; path: PGtkTreePath); cdecl; external gtklib;
 procedure gtk_tree_view_set_cursor_on_cell(tree_view:PGtkTreeView; path:PGtkTreePath; focus_column:PGtkTreeViewColumn; focus_cell:PGtkCellRenderer; start_editing:gboolean); cdecl; external gtklib;
 {$ENDIF}
+
+{$ifdef HasGTK2_6}
+function gtk_tree_view_get_fixed_height_mode(tree_view:PGtkTreeView):gboolean; cdecl; external gtklib;
+function gtk_tree_view_get_hover_expand(tree_view:PGtkTreeView):gboolean; cdecl; external gtklib;
+function gtk_tree_view_get_hover_selection(tree_view:PGtkTreeView):gboolean; cdecl; external gtklib;
+function gtk_tree_view_get_row_separator_func(tree_view:PGtkTreeView):TGtkTreeViewRowSeparatorFunc; cdecl; external gtklib;
+procedure gtk_tree_view_set_fixed_height_mode(tree_view:PGtkTreeView; enable:gboolean); cdecl; external gtklib;
+procedure gtk_tree_view_set_hover_expand(tree_view:PGtkTreeView; expand:gboolean); cdecl; external gtklib;
+procedure gtk_tree_view_set_hover_selection(tree_view:PGtkTreeView; hover:gboolean); cdecl; external gtklib;
+procedure gtk_tree_view_set_row_separator_func(tree_view:PGtkTreeView; func:TGtkTreeViewRowSeparatorFunc;
+  data:gpointer; destroy:TGtkDestroyNotify); cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkwindow.inc b/packages/gtk2/src/gtk+/gtk/gtkwindow.inc
index 0f71089a58..db22c2587b 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkwindow.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkwindow.inc
@@ -300,6 +300,13 @@ procedure gtk_window_set_keep_above(window:PGtkWindow; setting:gboolean); cdecl;
 procedure gtk_window_set_keep_below(window:PGtkWindow; setting:gboolean); cdecl; external gtklib;
 {$ENDIF HasGTK2_4}
 
+{$ifdef HasGTK2_6}
+function gtk_window_get_focus_on_map(window:PGtkWindow):gboolean; cdecl; external gtklib;
+function gtk_window_get_icon_name(window:PGtkWindow):Pgchar; cdecl; external gtklib;
+procedure gtk_window_set_default_icon_name(name:Pgchar); cdecl; external gtklib;
+procedure gtk_window_set_focus_on_map(window:PGtkWindow; setting:gboolean); cdecl; external gtklib;
+procedure gtk_window_set_icon_name(window:PGtkWindow; name:Pgchar); cdecl; external gtklib;
+{$endif}
 
 {$ENDIF read_interface_rest}