* Patch from Paul Ishenin <webpirat@mail.ru>

  - adds missing gtk+2.2 symbols
  - moves existing gtk+2.2 declarations into {$IFDEF HasGTK2_2} blocks



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

20 files changed, 101 insertions, 43 deletions

diff --git a/packages/gtk2/src/gtk+/gtk/gtkclipboard.inc b/packages/gtk2/src/gtk+/gtk/gtkclipboard.inc
index 8923118d5b..eeffb07c82 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkclipboard.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkclipboard.inc
@@ -26,13 +26,10 @@
 //------------------------------------------------------------------------------
 
 {$IFDEF read_interface_rest}
-function gtk_clipboard_get_for_display(display:PGdkDisplay; selection:TGdkAtom):PGtkClipboard; cdecl; external gtklib;
-
 {$ifndef GDK_MULTIHEAD_SAFE}
 function gtk_clipboard_get(selection:TGdkAtom):PGtkClipboard; cdecl; external gtklib;
 {$endif}
 
-function gtk_clipboard_get_display(clipboard:PGtkClipboard):PGdkDisplay; cdecl; external gtklib;
 function gtk_clipboard_set_with_data(clipboard:PGtkClipboard; targets:PGtkTargetEntry; n_targets:guint; get_func:TGtkClipboardGetFunc; clear_func:TGtkClipboardClearFunc;
            user_data:gpointer):gboolean; cdecl; external gtklib;
 function gtk_clipboard_set_with_owner(clipboard:PGtkClipboard; targets:PGtkTargetEntry; n_targets:guint; get_func:TGtkClipboardGetFunc; clear_func:TGtkClipboardClearFunc;
@@ -45,6 +42,12 @@ procedure gtk_clipboard_request_text(clipboard:PGtkClipboard; callback:TGtkClipb
 function gtk_clipboard_wait_for_contents(clipboard:PGtkClipboard; target:TGdkAtom):PGtkSelectionData; cdecl; external gtklib;
 function gtk_clipboard_wait_for_text(clipboard:PGtkClipboard):Pgchar; cdecl; external gtklib;
 function gtk_clipboard_wait_is_text_available(clipboard:PGtkClipboard):gboolean; cdecl; external gtklib;
+
+{$IFDEF HasGTK2_2}
+function gtk_clipboard_get_display(clipboard:PGtkClipboard):PGdkDisplay; cdecl; external gtklib;
+function gtk_clipboard_get_for_display(display:PGdkDisplay; selection:TGdkAtom):PGtkClipboard; cdecl; external gtklib;
+{$ENDIF}
+
 {$ENDIF read_interface_rest}
 // included by gtk2.pas
 
diff --git a/packages/gtk2/src/gtk+/gtk/gtkcolorsel.inc b/packages/gtk2/src/gtk+/gtk/gtkcolorsel.inc
index 85b2c084bc..32e92e4d17 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkcolorsel.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkcolorsel.inc
@@ -63,8 +63,6 @@ function gtk_color_selection_palette_to_string(colors:PGdkColor; n_colors:gint):
 function gtk_color_selection_set_change_palette_hook(func:TGtkColorSelectionChangePaletteFunc):TGtkColorSelectionChangePaletteFunc; cdecl; external gtklib;
 {$endif}
 
-function gtk_color_selection_set_change_palette_with_screen_hook(func:TGtkColorSelectionChangePaletteWithScreenFunc):TGtkColorSelectionChangePaletteWithScreenFunc; cdecl; external gtklib;
-
 {$ifndef GTK_DISABLE_DEPRECATED}
 { Deprecated calls:  }
 procedure gtk_color_selection_set_color(colorsel:PGtkColorSelection; color:Pgdouble); cdecl; external gtklib;
@@ -73,6 +71,10 @@ procedure gtk_color_selection_set_update_policy(colorsel:PGtkColorSelection; pol
 {$endif}
 { GTK_DISABLE_DEPRECATED  }
 
+{$IFDEF HasGTK2_2}
+function gtk_color_selection_set_change_palette_with_screen_hook(func:TGtkColorSelectionChangePaletteWithScreenFunc):TGtkColorSelectionChangePaletteWithScreenFunc; cdecl; external gtklib;
+{$ENDIF}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkiconfactory.inc b/packages/gtk2/src/gtk+/gtk/gtkiconfactory.inc
index 148046df1a..ed469feb2c 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkiconfactory.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkiconfactory.inc
@@ -97,6 +97,11 @@ function gtk_icon_source_get_size(source:PGtkIconSource):TGtkIconSize; cdecl; ex
 { ignore this  }
 procedure _gtk_icon_set_invalidate_caches; cdecl; external gtklib;
 function _gtk_icon_factory_list_ids:PGSList; cdecl; external gtklib;
+
+{$IFDEF HasGTK2_2}
+function gtk_icon_size_lookup_for_settings(settings: PGtkSettings; size: TGtkIconSize; width: Pgint; height: Pgint): gboolean; cdecl; external gtklib;
+{$ENDIF}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkinvisible.inc b/packages/gtk2/src/gtk+/gtk/gtkinvisible.inc
index 8f5b0bb8fe..e135835632 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkinvisible.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkinvisible.inc
@@ -38,9 +38,12 @@ function GTK_INVISIBLE_GET_CLASS(obj: pointer) : PGtkInvisibleClass;
 
 function gtk_invisible_get_type:TGtkType; cdecl; external gtklib;
 function gtk_invisible_new:PGtkWidget; cdecl; external gtklib;
+
+{$IFDEF HasGTK2_2}
+function gtk_invisible_get_screen(invisible:PGtkInvisible):PGdkScreen; cdecl; external gtklib;
 function gtk_invisible_new_for_screen(screen:PGdkScreen):PGtkWidget; cdecl; external gtklib;
 procedure gtk_invisible_set_screen(invisible:PGtkInvisible; screen:PGdkScreen); cdecl; external gtklib;
-function gtk_invisible_get_screen(invisible:PGtkInvisible):PGdkScreen; 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 121c9bd67c..b37fbcc0d3 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkliststore.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkliststore.inc
@@ -79,6 +79,14 @@ procedure gtk_list_store_insert_after(list_store:PGtkListStore; iter:PGtkTreeIte
 procedure gtk_list_store_prepend(list_store:PGtkListStore; iter:PGtkTreeIter); cdecl; external gtklib;
 procedure gtk_list_store_append(list_store:PGtkListStore; iter:PGtkTreeIter); cdecl; external gtklib;
 procedure gtk_list_store_clear(list_store:PGtkListStore); cdecl; external gtklib;
+
+{$IFDEF HasGTK2_2}
+function gtk_list_store_iter_is_valid(list_store:PGtkListStore; iter:PGtkTreeIter): gboolean; cdecl; external gtklib;
+procedure gtk_list_store_move_after(list_store:PGtkListStore; iter:PGtkTreeIter; position: PGtkTreeIter); cdecl; external gtklib;
+procedure gtk_list_store_move_before(list_store:PGtkListStore; iter:PGtkTreeIter; position: PGtkTreeIter); cdecl; external gtklib;
+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}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkmain.inc b/packages/gtk2/src/gtk+/gtk/gtkmain.inc
index cac332e317..fbc8cfaac7 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkmain.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkmain.inc
@@ -9,6 +9,8 @@
 { GTK_DISABLE_DEPRECATED  }
    TGtkModuleInitFunc = procedure (argc:Pgint; argv:PPPgchar); cdecl;
 
+   TGtkModuleDisplayInitFunc = procedure (display: PGdkDisplay); cdecl;
+
    TGtkKeySnoopFunc = function (grab_widget:PGtkWidget; event:PGdkEventKey; func_data:gpointer):gint; cdecl;
 {$ENDIF read_interface_types}
 
diff --git a/packages/gtk2/src/gtk+/gtk/gtkmenu.inc b/packages/gtk2/src/gtk+/gtk/gtkmenu.inc
index 0b2239b8bf..6efbed4b53 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkmenu.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkmenu.inc
@@ -146,7 +146,6 @@ function gtk_menu_get_tearoff_state(menu:PGtkMenu):gboolean; cdecl; external gtk
 procedure gtk_menu_set_title(menu:PGtkMenu; title:Pgchar); cdecl; external gtklib;
 function gtk_menu_get_title(menu:PGtkMenu):Pgchar; cdecl; external gtklib;
 procedure gtk_menu_reorder_child(menu:PGtkMenu; child:PGtkWidget; position:gint); cdecl; external gtklib;
-procedure gtk_menu_set_screen(menu:PGtkMenu; screen:PGdkScreen); cdecl; external gtklib;
 
 {$ifndef GTK_DISABLE_DEPRECATED}
 procedure gtk_menu_append(menu,child : PGtkWidget);
@@ -155,6 +154,9 @@ procedure gtk_menu_insert(menu,child: PGtkWidget; pos : gint);
 {$endif}
 { GTK_DISABLE_DEPRECATED  }
 
+{$IFDEF HasGTK2_2}
+procedure gtk_menu_set_screen(menu:PGtkMenu; screen:PGdkScreen); cdecl; external gtklib;
+{$ENDIF}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkmenushell.inc b/packages/gtk2/src/gtk+/gtk/gtkmenushell.inc
index 13e63aecc5..bfc0fe230f 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkmenushell.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkmenushell.inc
@@ -91,8 +91,11 @@ procedure gtk_menu_shell_activate_item(menu_shell:PGtkMenuShell; menu_item:PGtkW
 procedure _gtk_menu_shell_select_first(menu_shell:PGtkMenuShell); cdecl; external gtklib;
 procedure _gtk_menu_shell_activate(menu_shell:PGtkMenuShell); cdecl; external gtklib;
 
-{$IFDEF HasGTK2_4}
+{$IFDEF HasGTK2_2}
 procedure gtk_menu_shell_select_first(menu_shell: PGtkMenuShell; search_sensitive: gboolean);  cdecl; external gtklib;
+{$ENDIF}
+
+{$IFDEF HasGTK2_4}
 procedure gtk_menu_shell_cancel(menu_shell: PGtkMenuShell); cdecl; external gtklib;
 {$ENDIF HasGTK2_4}
 
diff --git a/packages/gtk2/src/gtk+/gtk/gtknotebook.inc b/packages/gtk2/src/gtk+/gtk/gtknotebook.inc
index eb561d4da4..26a6d007b8 100644
--- a/packages/gtk2/src/gtk+/gtk/gtknotebook.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtknotebook.inc
@@ -172,10 +172,9 @@ procedure gtk_notebook_query_tab_label_packing(notebook:PGtkNotebook;child:PGtkW
 procedure gtk_notebook_set_tab_label_packing(notebook:PGtkNotebook; child:PGtkWidget; expand:gboolean; fill:gboolean; pack_type:TGtkPackType); cdecl; external gtklib;
 procedure gtk_notebook_reorder_child(notebook:PGtkNotebook; child:PGtkWidget; position:gint); cdecl; external gtklib;
 
-{$IFDEF HasGTK2_4}
-function  gtk_notebook_get_n_pages(notebook:PGtkNotebook): integer; cdecl; external gtklib;
-{$ENDIF HasGTK2_4}
-
+{$IFDEF HasGTK2_2}
+function gtk_notebook_get_n_pages(notebook:PGtkNotebook): integer; cdecl; external gtklib;
+{$ENDIF}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtkplug.inc b/packages/gtk2/src/gtk+/gtk/gtkplug.inc
index bf52302c96..921a764112 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkplug.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkplug.inc
@@ -52,11 +52,14 @@ procedure gtk_plug_construct(plug:PGtkPlug; socket_id:TGdkNativeWindow); cdecl;
 function gtk_plug_new(socket_id:TGdkNativeWindow):PGtkWidget; cdecl; external gtklib;
 {$endif}
 
-procedure gtk_plug_construct_for_display(plug:PGtkPlug; display:PGdkDisplay; socket_id:TGdkNativeWindow); cdecl; external gtklib;
-function gtk_plug_new_for_display(display:PGdkDisplay; socket_id:TGdkNativeWindow):PGtkWidget; cdecl; external gtklib;
 function gtk_plug_get_id(plug:PGtkPlug):TGdkNativeWindow; cdecl; external gtklib;
 procedure _gtk_plug_add_to_socket(plug:PGtkPlug; socket:PGtkSocket); cdecl; external gtklib;
 procedure _gtk_plug_remove_from_socket(plug:PGtkPlug; socket:PGtkSocket); cdecl; external gtklib;
+
+{$IFDEF HasGTK2_2}
+procedure gtk_plug_construct_for_display(plug:PGtkPlug; display:PGdkDisplay; socket_id:TGdkNativeWindow); cdecl; external gtklib;
+function gtk_plug_new_for_display(display:PGdkDisplay; socket_id:TGdkNativeWindow):PGtkWidget; 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 de1fa83bb9..79f8165d79 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkselection.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkselection.inc
@@ -67,7 +67,6 @@ procedure gtk_target_list_remove(list:PGtkTargetList; target:TGdkAtom); cdecl; e
 function gtk_target_list_find(list:PGtkTargetList; target:TGdkAtom; info:Pguint):gboolean; cdecl; external gtklib;
 { Public interface  }
 function gtk_selection_owner_set(widget:PGtkWidget; selection:TGdkAtom; time:guint32):gboolean; cdecl; external gtklib;
-function gtk_selection_owner_set_for_display(display:PGdkDisplay; widget:PGtkWidget; selection:TGdkAtom; time:guint32):gboolean; cdecl; external gtklib;
 procedure gtk_selection_add_target(widget:PGtkWidget; selection:TGdkAtom; target:TGdkAtom; info:guint); cdecl; external gtklib;
 procedure gtk_selection_add_targets(widget:PGtkWidget; selection:TGdkAtom; targets:PGtkTargetEntry; ntargets:guint); cdecl; external gtklib;
 procedure gtk_selection_clear_targets(widget:PGtkWidget; selection:TGdkAtom); cdecl; external gtklib;
@@ -80,7 +79,6 @@ function gtk_selection_data_targets_include_text(selection_data:PGtkSelectionDat
 { Called when a widget is destroyed  }
 procedure gtk_selection_remove_all(widget:PGtkWidget); cdecl; external gtklib;
 { Event handlers  }
-function gtk_selection_clear(widget:PGtkWidget; event:PGdkEventSelection):gboolean; cdecl; external gtklib;
 function gtk_selection_request(widget:PGtkWidget; event:PGdkEventSelection):gboolean; cdecl; external gtklib;
 function gtk_selection_incr_event(window:PGdkWindow; event:PGdkEventProperty):gboolean; cdecl; external gtklib;
 function gtk_selection_notify(widget:PGtkWidget; event:PGdkEventSelection):gboolean; cdecl; external gtklib;
@@ -88,6 +86,11 @@ function gtk_selection_property_notify(widget:PGtkWidget; event:PGdkEventPropert
 function gtk_selection_data_get_type:GType; cdecl; external gtklib;
 function gtk_selection_data_copy(data:PGtkSelectionData):PGtkSelectionData; cdecl; external gtklib;
 procedure gtk_selection_data_free(data:PGtkSelectionData); cdecl; external gtklib;
+
+{$IFDEF HasGTK2_2}
+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}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtksettings.inc b/packages/gtk2/src/gtk+/gtk/gtksettings.inc
index ea5bc374a4..367c0e50ce 100644
--- a/packages/gtk2/src/gtk+/gtk/gtksettings.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtksettings.inc
@@ -57,7 +57,6 @@ function gtk_settings_get_type:GType; cdecl; external gtklib;
 function gtk_settings_get_default:PGtkSettings; cdecl; external gtklib;
 {$endif}
 
-function gtk_settings_get_for_screen(screen:PGdkScreen):PGtkSettings; cdecl; external gtklib;
 procedure gtk_settings_install_property(pspec:PGParamSpec); cdecl; external gtklib;
 procedure gtk_settings_install_property_parser(pspec:PGParamSpec; parser:TGtkRcPropertyParser); cdecl; external gtklib;
 { --- precoded parsing functions ---  }
@@ -75,6 +74,10 @@ procedure gtk_settings_set_double_property(settings:PGtkSettings; name:Pgchar; v
 procedure _gtk_settings_handle_event(event:PGdkEventSetting); cdecl; external gtklib;
 function _gtk_rc_property_parser_from_type(_type:GType):TGtkRcPropertyParser; cdecl; external gtklib;
 function _gtk_settings_parse_convert(parser:TGtkRcPropertyParser; src_value:PGValue; pspec:PGParamSpec; dest_value:PGValue):gboolean; cdecl; external gtklib;
+
+{$IFDEF HasGTK2_2}
+function gtk_settings_get_for_screen(screen:PGdkScreen):PGtkSettings; cdecl; external gtklib;
+{$ENDIF}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtktreemodel.inc b/packages/gtk2/src/gtk+/gtk/gtktreemodel.inc
index c48b3c7c3e..42db28bc14 100644
--- a/packages/gtk2/src/gtk+/gtk/gtktreemodel.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtktreemodel.inc
@@ -146,6 +146,12 @@ procedure gtk_tree_model_row_inserted(tree_model:PGtkTreeModel; path:PGtkTreePat
 procedure gtk_tree_model_row_has_child_toggled(tree_model:PGtkTreeModel; path:PGtkTreePath; iter:PGtkTreeIter); cdecl; external gtklib;
 procedure gtk_tree_model_row_deleted(tree_model:PGtkTreeModel; path:PGtkTreePath); cdecl; external gtklib;
 procedure gtk_tree_model_rows_reordered(tree_model:PGtkTreeModel; path:PGtkTreePath; iter:PGtkTreeIter; new_order:Pgint); cdecl; external gtklib;
+
+{$IFDEF HasGTK2_2}
+function gtk_tree_model_get_string_from_iter(tree_model:PGtkTreeModel; iter:PGtkTreeIter):Pgchar; cdecl; external gtklib;
+function gtk_tree_path_new_from_indices(first_index: gint): PGtkTreePath; cdecl; varargs; external gtklib;
+function gtk_tree_row_reference_copy(reference:PGtkTreeRowReference):PGtkTreeRowReference; cdecl; external gtklib;
+{$ENDIF}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtktreemodelsort.inc b/packages/gtk2/src/gtk+/gtk/gtktreemodelsort.inc
index 0988d7a393..ac1cfef75f 100644
--- a/packages/gtk2/src/gtk+/gtk/gtktreemodelsort.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtktreemodelsort.inc
@@ -63,6 +63,10 @@ function gtk_tree_model_sort_convert_path_to_child_path(tree_model_sort:PGtkTree
 procedure gtk_tree_model_sort_convert_iter_to_child_iter(tree_model_sort:PGtkTreeModelSort; child_iter:PGtkTreeIter; sorted_iter:PGtkTreeIter); cdecl; external gtklib;
 procedure gtk_tree_model_sort_reset_default_sort_func(tree_model_sort:PGtkTreeModelSort); cdecl; external gtklib;
 procedure gtk_tree_model_sort_clear_cache(tree_model_sort:PGtkTreeModelSort); cdecl; external gtklib;
+
+{$IFDEF HasGTK2_2}
+function gtk_tree_model_sort_iter_is_valid(tree_model_sort:PGtkTreeModelSort; iter:PGtkTreeIter): gboolean; cdecl; external gtklib;
+{$ENDIF}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtktreeselection.inc b/packages/gtk2/src/gtk+/gtk/gtktreeselection.inc
index 47f0bac143..3488831a2f 100644
--- a/packages/gtk2/src/gtk+/gtk/gtktreeselection.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtktreeselection.inc
@@ -54,8 +54,6 @@ function gtk_tree_selection_get_tree_view(selection:PGtkTreeSelection):PGtkTreeV
 { Only meaningful if GTK_TREE_SELECTION_SINGLE is set  }
 { Use selected_foreach for GTK_TREE_SELECTION_MULTI  }
 function gtk_tree_selection_get_selected(selection:PGtkTreeSelection; model:PPGtkTreeModel; iter:PGtkTreeIter):gboolean; cdecl; external gtklib;
-{ gtk_tree_selection_get_selected_rows was later added, so maybe some older libs don't have it }
-function gtk_tree_selection_get_selected_rows(selection:PGtkTreeSelection; model:PPGtkTreeModel):PGList; cdecl; external gtklib;
 procedure gtk_tree_selection_selected_foreach(selection:PGtkTreeSelection; func:TGtkTreeSelectionForeachFunc; data:gpointer); cdecl; external gtklib;
 procedure gtk_tree_selection_select_path(selection:PGtkTreeSelection; path:PGtkTreePath); cdecl; external gtklib;
 procedure gtk_tree_selection_unselect_path(selection:PGtkTreeSelection; path:PGtkTreePath); cdecl; external gtklib;
@@ -66,6 +64,12 @@ function gtk_tree_selection_iter_is_selected(selection:PGtkTreeSelection; iter:P
 procedure gtk_tree_selection_select_all(selection:PGtkTreeSelection); cdecl; external gtklib;
 procedure gtk_tree_selection_unselect_all(selection:PGtkTreeSelection); cdecl; external gtklib;
 procedure gtk_tree_selection_select_range(selection:PGtkTreeSelection; start_path:PGtkTreePath; end_path:PGtkTreePath); cdecl; external gtklib;
+
+{$IFDEF HasGTK2_2}
+function gtk_tree_selection_count_selected_rows(selection:PGtkTreeSelection):gint; cdecl; external gtklib;
+function gtk_tree_selection_get_selected_rows(selection:PGtkTreeSelection; model:PPGtkTreeModel):PGList; cdecl; external gtklib;
+procedure gtk_tree_selection_unselect_range(selection:PGtkTreeSelection; start_path:PGtkTreePath; end_path:PGtkTreePath); cdecl; external gtklib;
+{$ENDIF}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtktreestore.inc b/packages/gtk2/src/gtk+/gtk/gtktreestore.inc
index f45d7d6efe..f216719d59 100644
--- a/packages/gtk2/src/gtk+/gtk/gtktreestore.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtktreestore.inc
@@ -84,18 +84,13 @@ function gtk_tree_store_is_ancestor(tree_store:PGtkTreeStore; iter:PGtkTreeIter;
 function gtk_tree_store_iter_depth(tree_store:PGtkTreeStore; iter:PGtkTreeIter):gint; cdecl; external gtklib;
 procedure gtk_tree_store_clear(tree_store:PGtkTreeStore); cdecl; external gtklib;
 
-{$IFDEF GTK2_2}
-function gtk_tree_store_iter_is_valid(tree_store:PGtkTreeStore;
-  iter:PGtkTreeIter):gboolean; cdecl; external gtklib;
-procedure gtk_tree_store_reorder(tree_store:PGtkTreeStore;
-  parent:PGtkTreeIter; new_order:pgint); cdecl; external gtklib;
-procedure gtk_tree_store_swap(tree_store:PGtkTreeStore;
-  a:PGtkTreeIter; b:PGtkTreeIter); cdecl; external gtklib;
-procedure gtk_tree_store_move_before(tree_store:PGtkTreeStore;
-  iter:PGtkTreeIter; position:PGtkTreeIter); cdecl; external gtklib;
-procedure gtk_tree_store_move_after(tree_store:PGtkTreeStore;
-  iter:PGtkTreeIter; position:PGtkTreeIter); cdecl; external gtklib;
-{$ENDIF}
+{$IFDEF HasGTK2_2}
+function gtk_tree_store_iter_is_valid(tree_store:PGtkTreeStore; iter:PGtkTreeIter):gboolean; cdecl; external gtklib;
+procedure gtk_tree_store_reorder(tree_store:PGtkTreeStore; parent:PGtkTreeIter; new_order:pgint); cdecl; external gtklib;
+procedure gtk_tree_store_swap(tree_store:PGtkTreeStore; a:PGtkTreeIter; b:PGtkTreeIter); cdecl; external gtklib;
+procedure gtk_tree_store_move_before(tree_store:PGtkTreeStore; iter:PGtkTreeIter; position:PGtkTreeIter); cdecl; external gtklib;
+procedure gtk_tree_store_move_after(tree_store:PGtkTreeStore; iter:PGtkTreeIter; position:PGtkTreeIter); cdecl; external gtklib;
+{$ENDIF HasGTK2_2}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtktreeview.inc b/packages/gtk2/src/gtk+/gtk/gtktreeview.inc
index d7df7f265f..a5c2597409 100644
--- a/packages/gtk2/src/gtk+/gtk/gtktreeview.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtktreeview.inc
@@ -128,7 +128,6 @@ function gtk_tree_view_row_expanded(tree_view:PGtkTreeView; path:PGtkTreePath):g
 procedure gtk_tree_view_set_reorderable(tree_view:PGtkTreeView; reorderable:gboolean); cdecl; external gtklib;
 function gtk_tree_view_get_reorderable(tree_view:PGtkTreeView):gboolean; cdecl; external gtklib;
 procedure gtk_tree_view_set_cursor(tree_view:PGtkTreeView; path:PGtkTreePath; focus_column:PGtkTreeViewColumn; start_editing:gboolean); 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;
 procedure gtk_tree_view_get_cursor(tree_view:PGtkTreeView; var path:PGtkTreePath; var focus_column:PGtkTreeViewColumn); cdecl; external gtklib;
 { Layout information  }
 function gtk_tree_view_get_bin_window(tree_view:PGtkTreeView):PGdkWindow; cdecl; external gtklib;
@@ -158,6 +157,11 @@ function gtk_tree_view_get_search_equal_func(tree_view:PGtkTreeView):TGtkTreeVie
 procedure gtk_tree_view_set_search_equal_func(tree_view:PGtkTreeView; search_equal_func:TGtkTreeViewSearchEqualFunc; search_user_data:gpointer; search_destroy:TGtkDestroyNotify); cdecl; external gtklib;
 
 procedure gtk_tree_view_set_destroy_count_func(tree_view:PGtkTreeView; func:TGtkTreeDestroyCountFunc; data:gpointer; destroy:TGtkDestroyNotify); cdecl; external gtklib;
+
+{$IFDEF HasGTK2_2}
+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}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------
diff --git a/packages/gtk2/src/gtk+/gtk/gtktreeviewcolumn.inc b/packages/gtk2/src/gtk+/gtk/gtktreeviewcolumn.inc
index cde9f56fbb..c05b93cdeb 100644
--- a/packages/gtk2/src/gtk+/gtk/gtktreeviewcolumn.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtktreeviewcolumn.inc
@@ -181,7 +181,10 @@ procedure gtk_tree_view_column_cell_set_cell_data(tree_column:PGtkTreeViewColumn
 procedure gtk_tree_view_column_cell_get_size(tree_column:PGtkTreeViewColumn; cell_area:PGdkRectangle; x_offset:Pgint; y_offset:Pgint; width:Pgint;
             height:Pgint); cdecl; external gtklib;
 function gtk_tree_view_column_cell_is_visible(tree_column:PGtkTreeViewColumn):gboolean; cdecl; external gtklib;
+
+{$IFDEF HasGTK2_2}
 procedure gtk_tree_view_column_focus_cell(tree_column:PGtkTreeViewColumn; cell:PGtkCellRenderer); cdecl; external gtklib;
+{$ENDIF}
 
 // since gtk 2.4
 procedure gtk_tree_view_column_set_expand(tree_column: PGtkTreeViewColumn; Expand : gboolean); cdecl; external gtklib;
diff --git a/packages/gtk2/src/gtk+/gtk/gtkwidget.inc b/packages/gtk2/src/gtk+/gtk/gtkwidget.inc
index 3613a81019..29a1ba1df3 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkwidget.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkwidget.inc
@@ -418,12 +418,7 @@ function gtk_widget_get_toplevel(widget:PGtkWidget):PGtkWidget; cdecl; external
 function gtk_widget_get_ancestor(widget:PGtkWidget; widget_type:TGtkType):PGtkWidget; cdecl; external gtklib;
 function gtk_widget_get_colormap(widget:PGtkWidget):PGdkColormap; cdecl; external gtklib;
 function gtk_widget_get_visual(widget:PGtkWidget):PGdkVisual; cdecl; external gtklib;
-function gtk_widget_get_screen(widget:PGtkWidget):PGdkScreen; cdecl; external gtklib;
-function gtk_widget_has_screen(widget:PGtkWidget):gboolean; cdecl; external gtklib;
-function gtk_widget_get_display(widget:PGtkWidget):PGdkDisplay; cdecl; external gtklib;
-function gtk_widget_get_root_window(widget:PGtkWidget):PGdkWindow; cdecl; external gtklib;
 function gtk_widget_get_settings(widget:PGtkWidget):PGtkSettings; cdecl; external gtklib;
-function gtk_widget_get_clipboard(widget:PGtkWidget; selection:TGdkAtom):PGtkClipboard; cdecl; external gtklib;
 
 {$ifndef GTK_DISABLE_DEPRECATED}
 procedure gtk_widget_set_visual(widget,visual : pointer);
@@ -493,8 +488,6 @@ procedure gtk_widget_pop_colormap; cdecl; external gtklib;
   }
 procedure gtk_widget_class_install_style_property(klass:PGtkWidgetClass; pspec:PGParamSpec); cdecl; external gtklib;
 procedure gtk_widget_class_install_style_property_parser(klass:PGtkWidgetClass; pspec:PGParamSpec; parser:TGtkRcPropertyParser); cdecl; external gtklib;
-function gtk_widget_class_find_style_property(klass:PGtkWidgetClass; property_name:Pgchar):PGParamSpec; cdecl; external gtklib;
-function gtk_widget_class_list_style_properties(klass:PGtkWidgetClass; n_properties:Pguint):PPGParamSpec; cdecl; external gtklib;
 procedure gtk_widget_style_get_property(widget:PGtkWidget; property_name:Pgchar; value:PGValue); cdecl; external gtklib;
 {$IFNDEF KYLIX}
 procedure gtk_widget_style_get_valist(widget:PGtkWidget; first_property_name:Pgchar; var_args: array of const); cdecl; external gtklib;
@@ -537,6 +530,16 @@ procedure gtk_requisition_free(requisition:PGtkRequisition); cdecl; external gtk
 function _gtk_widget_get_aux_info(widget:PGtkWidget; create:gboolean):PGtkWidgetAuxInfo; cdecl; external gtklib;
 procedure _gtk_widget_propagate_hierarchy_changed(widget:PGtkWidget; previous_toplevel:PGtkWidget); cdecl; external gtklib;
 function _gtk_widget_peek_colormap:PGdkColormap; cdecl; external gtklib;
+
+{$IFDEF HasGTK2_2}
+function gtk_widget_class_find_style_property(klass:PGtkWidgetClass; property_name:Pgchar):PGParamSpec; cdecl; external gtklib;
+function gtk_widget_class_list_style_properties(klass:PGtkWidgetClass; n_properties:Pguint):PPGParamSpec; cdecl; external gtklib;
+function gtk_widget_get_clipboard(widget:PGtkWidget; selection:TGdkAtom):PGtkClipboard; cdecl; external gtklib;
+function gtk_widget_get_display(widget:PGtkWidget):PGdkDisplay; cdecl; external gtklib;
+function gtk_widget_get_root_window(widget:PGtkWidget):PGdkWindow; cdecl; external gtklib;
+function gtk_widget_get_screen(widget:PGtkWidget):PGdkScreen; cdecl; external gtklib;
+function gtk_widget_has_screen(widget:PGtkWidget):gboolean; 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 a440af3d2d..39281543c1 100644
--- a/packages/gtk2/src/gtk+/gtk/gtkwindow.inc
+++ b/packages/gtk2/src/gtk+/gtk/gtkwindow.inc
@@ -202,8 +202,6 @@ function gtk_window_get_resizable(window:PGtkWindow):gboolean; cdecl; external g
 procedure gtk_window_set_gravity(window:PGtkWindow; gravity:TGdkGravity); cdecl; external gtklib;
 function gtk_window_get_gravity(window:PGtkWindow):TGdkGravity; cdecl; external gtklib;
 procedure gtk_window_set_geometry_hints(window:PGtkWindow; geometry_widget:PGtkWidget; geometry:PGdkGeometry; geom_mask:TGdkWindowHints); cdecl; external gtklib;
-procedure gtk_window_set_screen(window:PGtkWindow; screen:PGdkScreen); cdecl; external gtklib;
-function gtk_window_get_screen(window:PGtkWindow):PGdkScreen; cdecl; external gtklib;
 { gtk_window_set_has_frame () must be called before realizing the window_ }
 procedure gtk_window_set_has_frame(window:PGtkWindow; setting:gboolean); cdecl; external gtklib;
 function gtk_window_get_has_frame(window:PGtkWindow):gboolean; cdecl; external gtklib;
@@ -239,10 +237,15 @@ procedure gtk_window_fullscreen(window: PGtkWindow); cdecl; external gtklib;
 procedure gtk_window_unfullscreen(window: PGtkWindow); cdecl; external gtklib;
 procedure gtk_window_set_keep_above(window: PGtkWindow; setting: gboolean); cdecl; external gtklib;
 procedure gtk_window_set_keep_below(window: PGtkWindow; setting: gboolean); cdecl; external gtklib;
-function  gtk_window_get_skip_pager_hint(window:PGtkWindow):gboolean; cdecl; external gtklib;
+procedure gtk_window_set_screen(window:PGtkWindow; screen:PGdkScreen); cdecl; external gtklib;
+function gtk_window_get_screen(window:PGtkWindow):PGdkScreen; cdecl; external gtklib;
+function gtk_window_get_skip_pager_hint(window:PGtkWindow):gboolean; cdecl; external gtklib;
 procedure gtk_window_set_skip_pager_hint(window:PGtkWindow; setting:gboolean); cdecl; external gtklib;
-function  gtk_window_get_skip_taskbar_hint(window:PGtkWindow):gboolean; cdecl; external gtklib;
+function gtk_window_get_skip_taskbar_hint(window:PGtkWindow):gboolean; cdecl; external gtklib;
 procedure gtk_window_set_skip_taskbar_hint(window:PGtkWindow; setting:gboolean); cdecl; external gtklib;
+procedure gtk_window_set_auto_startup_notification(setting:gboolean); cdecl; external gtklib;
+function gtk_window_set_default_icon_from_file(filename: Pgchar; err: PPGError):gboolean; cdecl; external gtklib;
+function gtk_window_set_icon_from_file(window: PGtkWindow; filename: Pgchar; err: PPGError):gboolean; cdecl; external gtklib;
 {$endif HasGTK2_2}
 
 procedure gtk_window_begin_resize_drag(window:PGtkWindow; edge:TGdkWindowEdge; button:gint; root_x:gint; root_y:gint;