* Patch from Paul Ishenin to add GTK 2.4 symbols

git-svn-id: trunk@11587 -

.gitattributes

@@ -2346,6 +2346,7 @@ packages/gtk2/src/gtk+/gtk/gtkscrolledwindow.inc svneol=native#text/plain
 packages/gtk2/src/gtk+/gtk/gtkselection.inc svneol=native#text/plain
 packages/gtk2/src/gtk+/gtk/gtkseparator.inc svneol=native#text/plain
 packages/gtk2/src/gtk+/gtk/gtkseparatormenuitem.inc svneol=native#text/plain
+packages/gtk2/src/gtk+/gtk/gtkseparatortoolitem.inc svneol=native#text/plain
 packages/gtk2/src/gtk+/gtk/gtksettings.inc svneol=native#text/plain
 packages/gtk2/src/gtk+/gtk/gtksignal.inc svneol=native#text/plain
 packages/gtk2/src/gtk+/gtk/gtksizegroup.inc svneol=native#text/plain

packages/gtk2/src/gtk+/gdk/gdktypes.inc

@@ -40,6 +40,7 @@
         height : gint;
      end;
 
+   PPGdkAtom = ^PGdkAtom;
    PGdkAtom = ^TGdkAtom;
    // internal type
    TGdkAtom = PtrUInt;

packages/gtk2/src/gtk+/gtk/gtkaccelmap.inc

@@ -1,11 +1,21 @@
 // included by gtk2.pas
 
 {$IFDEF read_forward_definitions}
+  PGtkAccelMap = ^TGtkAccelMap;
 {$ENDIF read_forward_definitions}
 
 //------------------------------------------------------------------------------
 
 {$IFDEF read_interface_types}
+  TGtkAccelMap = record
+    parent_instance: TGObject;
+  end;
+
+  PGtkAccelMapClass = ^TGtkAccelMapClass;
+  TGtkAccelMapClass = record
+    parent_class: TGObjectClass;
+  end;
+
 { --- notifier ---  }
    TGtkAccelMapForeach = procedure (data:gpointer; accel_path:Pgchar; accel_key:guint; accel_mods:TGdkModifierType; changed:gboolean); cdecl;
 {$ENDIF read_interface_types}
@@ -13,7 +23,16 @@
 //------------------------------------------------------------------------------
 
 {$IFDEF read_interface_rest}
+function GTK_TYPE_ACCEL_MAP : GType;
+function GTK_ACCEL_MAP(obj: pointer) : PGtkAccelMap;
+function GTK_ACCEL_MAP_CLASS(klass : pointer) : PGtkAccelMapClass;
+function GTK_IS_ACCEL_MAP(obj: pointer) : boolean;
+function GTK_IS_ACCEL_MAP_CLASS(klass : pointer) : boolean;
+function GTK_ACCEL_MAP_GET_CLASS(obj: pointer) : PGtkAccelMapClass;
+
 { --- public API ---  }
+function gtk_accel_map_get_type: GType; cdecl; external gtklib;
+
 procedure gtk_accel_map_add_entry(accel_path:Pgchar; accel_key:guint; accel_mods:TGdkModifierType); cdecl; external gtklib;
 function gtk_accel_map_lookup_entry(accel_path:Pgchar; key:PGtkAccelKey):gboolean; cdecl; external gtklib;
 function gtk_accel_map_change_entry(accel_path:Pgchar; accel_key:guint; accel_mods:TGdkModifierType; replace:gboolean):gboolean; cdecl; external gtklib;
@@ -31,6 +50,45 @@ procedure _gtk_accel_map_init; cdecl; external gtklib;
 procedure _gtk_accel_map_add_group(accel_path:Pgchar; accel_group:PGtkAccelGroup); cdecl; external gtklib;
 procedure _gtk_accel_map_remove_group(accel_path:Pgchar; accel_group:PGtkAccelGroup); cdecl; external gtklib;
 function _gtk_accel_path_is_valid(accel_path:Pgchar):gboolean; cdecl; external gtklib;
+
+{$ifdef HasGTK2_4}
+function gtk_accel_map_get: PGtkAccelMap; cdecl; external gtklib;
+procedure gtk_accel_map_lock_path(accel_path: Pgchar); cdecl; external gtklib;
+procedure gtk_accel_map_unlock_path(accel_path: Pgchar); cdecl; external gtklib;
+{$endif}
+
 {$endif read_interface_rest}
-// included by gtk2.pas
 
+//------------------------------------------------------------------------------
+
+{$IFDEF read_implementation}
+function GTK_TYPE_ACCEL_MAP : GType;
+begin
+   GTK_TYPE_ACCEL_MAP:=gtk_accel_map_get_type;
+end;
+
+function GTK_ACCEL_MAP(obj: pointer) : PGtkAccelMap;
+begin
+   GTK_ACCEL_MAP:=PGtkAccelMap(GTK_CHECK_CAST(obj,GTK_TYPE_ACCEL_MAP));
+end;
+
+function GTK_ACCEL_MAP_CLASS(klass: pointer) : PGtkAccelMapClass;
+begin
+   GTK_ACCEL_MAP_CLASS:=PGtkAccelMapClass(GTK_CHECK_CLASS_CAST(klass,GTK_TYPE_ACCEL_MAP));
+end;
+
+function GTK_IS_ACCEL_MAP(obj: pointer) : boolean;
+begin
+   GTK_IS_ACCEL_MAP:=GTK_CHECK_TYPE(obj,GTK_TYPE_ACCEL_MAP);
+end;
+
+function GTK_IS_ACCEL_MAP_CLASS(klass: pointer) : boolean;
+begin
+   GTK_IS_ACCEL_MAP_CLASS:=GTK_CHECK_CLASS_TYPE(klass,GTK_TYPE_ACCEL_MAP);
+end;
+
+function GTK_ACCEL_MAP_GET_CLASS(obj: pointer) : PGtkAccelMapClass;
+begin
+   GTK_ACCEL_MAP_GET_CLASS:=PGtkAccelMapClass(GTK_CHECK_GET_CLASS(obj,GTK_TYPE_ACCEL_MAP));
+end;
+{$ENDIF read_implementation}

packages/gtk2/src/gtk+/gtk/gtkaction.inc

@@ -36,21 +36,13 @@ type
 
 {$IFDEF read_interface_rest}
 
-
 function GTK_TYPE_ACTION : GType;
-
 function GTK_ACTION(obj : pointer) : PGtkAction;
-
 function GTK_ACTION_CLASS(klass : pointer) : PGtkActionClass;
-
 function GTK_IS_ACTION(obj : pointer) : gboolean;
-
 function GTK_IS_ACTION_CLASS(klass : pointer) : gboolean;
-
 function GTK_ACTION_GET_CLASS(obj : pointer) : PGtkActionClass;
 
-
-
 function gtk_action_get_type:GType;cdecl;external gtklib name 'gtk_action_get_type';
 function gtk_action_new(name:Pgchar; szLabel:Pgchar; tooltip:Pgchar; stock_id:Pgchar):PGtkAction;cdecl;external gtklib name 'gtk_action_new';
 
@@ -78,10 +70,15 @@ procedure _gtk_action_emit_activate(action:PGtkAction);cdecl;external gtklib nam
 
 procedure gtk_action_set_accel_path(action:PGtkAction; accel_path:Pgchar);cdecl;external gtklib name 'gtk_action_set_accel_path';
 procedure gtk_action_set_accel_group(action:PGtkAction; accel_group:PGtkAccelGroup);cdecl;external gtklib name 'gtk_action_set_accel_group';
+
+{$ifdef HasGTK2_6}
+function gtk_action_get_accel_path(action: PGtkAction): Pgchar; cdecl;external gtklib name 'gtk_action_get_accel_path';
+{$endif}
 {$endif read_interface_rest}
 
 
 {$ifdef read_implementation}
+
 function GTK_TYPE_ACTION : GType;
 begin
    GTK_TYPE_ACTION:=gtk_action_get_type;

packages/gtk2/src/gtk+/gtk/gtkalignment.inc

@@ -36,6 +36,11 @@ function GTK_ALIGNMENT_GET_CLASS(obj: pointer) : PGtkAlignmentClass;
 function gtk_alignment_get_type:TGtkType; cdecl; external gtklib;
 function gtk_alignment_new(xalign:gfloat; yalign:gfloat; xscale:gfloat; yscale:gfloat):PGtkWidget; cdecl; external gtklib;
 procedure gtk_alignment_set(alignment:PGtkAlignment; xalign:gfloat; yalign:gfloat; xscale:gfloat; yscale:gfloat); cdecl; external gtklib;
+
+{$ifdef HasGTK2_4}
+procedure gtk_alignment_get_padding(alignment: PGtkAlignment; padding_top: Pguint; padding_bottom: Pguint; padding_left: Pguint; padding_right: Pguint); cdecl; external gtklib;
+procedure gtk_alignment_set_padding(alignment: PGtkAlignment; padding_top: guint; padding_bottom: guint; padding_left: guint; padding_right: guint); cdecl; external gtklib;
+{$endif}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtkbbox.inc

@@ -54,6 +54,10 @@ procedure gtk_button_box_get_child_ipadding(widget:PGtkButtonBox; ipad_x:Pgint;
 { Internal method - do not use.  }
 
 procedure _gtk_button_box_child_requisition(widget:PGtkWidget; nvis_children:Plongint; nvis_secondaries:Plongint; width:Plongint; height:Plongint); cdecl; external gtklib;
+
+{$ifdef HasGTK2_4}
+function gtk_button_box_get_child_secondary(widget: PGtkButtonBox; child: PGtkWidget):gboolean; cdecl; external gtklib;
+{$endif}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtkcelllayout.inc

@@ -55,6 +55,7 @@ procedure gtk_cell_layout_reorder(cell_layout:PGtkCellLayout; cell:PGtkCellRende
 {$endif read_interface_rest}
 
 {$ifdef read_implementation}
+
 function GTK_TYPE_CELL_LAYOUT : GType;
 begin
    GTK_TYPE_CELL_LAYOUT:=gtk_cell_layout_get_type;

packages/gtk2/src/gtk+/gtk/gtkcellrenderer.inc

@@ -103,6 +103,14 @@ function gtk_cell_renderer_start_editing(cell:PGtkCellRenderer; event:PGdkEvent;
            cell_area:PGdkRectangle; flags:TGtkCellRendererState):PGtkCellEditable; cdecl; external gtklib;
 procedure gtk_cell_renderer_set_fixed_size(cell:PGtkCellRenderer; width:gint; height:gint); cdecl; external gtklib;
 procedure gtk_cell_renderer_get_fixed_size(cell:PGtkCellRenderer; width:Pgint; height:Pgint); cdecl; external gtklib;
+
+{$ifdef HasGTK2_4}
+procedure gtk_cell_renderer_editing_canceled(cell: PGtkCellRenderer); cdecl; external gtklib; deprecated;
+{$endif}
+
+{$ifdef HasGTK2_6}
+procedure gtk_cell_renderer_stop_editing(cell: PGtkCellRenderer; canceled: gboolean); cdecl; external gtklib;
+{$endif}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtkcheckmenuitem.inc

@@ -65,6 +65,11 @@ procedure gtk_check_menu_item_set_show_toggle(menu_item:PGtkCheckMenuItem; alway
 
 procedure gtk_check_menu_item_set_state(check_menu_item:PGtkCheckMenuItem; is_active:gboolean);
 {$endif}
+
+{$ifdef HasGTK2_4}
+function gtk_check_menu_item_get_draw_as_radio(check_menu_item: PGtkCheckMenuItem):gboolean; cdecl; external gtklib;
+procedure gtk_check_menu_item_set_draw_as_radio(check_menu_item: PGtkCheckMenuItem; draw_as_radio: gboolean); cdecl; external gtklib;
+{$endif}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtkclipboard.inc

@@ -21,6 +21,8 @@
 
    TGtkClipboardClearFunc = procedure (clipboard:PGtkClipboard; user_data_or_owner:gpointer); cdecl;
 
+   TGtkClipboardTargetsReceivedFunc = procedure (clipboard:PGtkClipboard; atoms: PGdkAtom; n_atoms: gint; data: gpointer); cdecl;
+
 {$ENDIF read_interface_types}
 
 //------------------------------------------------------------------------------
@@ -48,6 +50,11 @@ function gtk_clipboard_get_display(clipboard:PGtkClipboard):PGdkDisplay; cdecl;
 function gtk_clipboard_get_for_display(display:PGdkDisplay; selection:TGdkAtom):PGtkClipboard; cdecl; external gtklib;
 {$ENDIF}
 
+{$ifdef HasGTK2_4}
+procedure gtk_clipboard_request_targets(clipboard: PGtkClipboard; callback: TGtkClipboardTargetsReceivedFunc; user_data: gpointer); cdecl; external gtklib;
+function gtk_clipboard_wait_for_targets(clipboard: PGtkClipboard; targets: PPGdkAtom; n_targets: Pgint):gboolean; cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 // included by gtk2.pas
 

packages/gtk2/src/gtk+/gtk/gtkcolorbutton.inc

@@ -35,8 +35,6 @@ function GTK_IS_COLOR_BUTTON(obj : pointer) : gboolean;
 function GTK_IS_COLOR_BUTTON_CLASS(klass : pointer) : gboolean;
 function GTK_COLOR_BUTTON_GET_CLASS(obj : pointer) : PGtkColorButtonClass;
 
-
-
 function gtk_color_button_get_type:GType;cdecl;external gtklib name 'gtk_color_button_get_type';
 function gtk_color_button_new:PGtkWidget;cdecl;external gtklib name 'gtk_color_button_new';
 

packages/gtk2/src/gtk+/gtk/gtkcomboboxentry.inc

@@ -24,6 +24,7 @@ type
 {$ENDIF read_interface_types}
 
 {$IFDEF read_interface_rest}
+
 function GTK_TYPE_COMBO_BOX_ENTRY : GType;
 function GTK_COMBO_BOX_ENTRY(obj : pointer) : PGtkComboBoxEntry;
 function GTK_COMBO_BOX_ENTRY_CLASS(vtable : pointer) : PGtkComboBoxEntryClass;

packages/gtk2/src/gtk+/gtk/gtkdnd.inc

@@ -73,6 +73,11 @@ procedure gtk_drag_set_default_icon(colormap:PGdkColormap; pixmap:PGdkPixmap; ma
 {$endif}
 { !GTK_DISABLE_DEPRECATED  }
 
+{$ifdef HasGTK2_4}
+function gtk_drag_source_get_target_list(widget: PGtkWidget):PGtkTargetList; cdecl; external gtklib;
+procedure gtk_drag_source_set_target_list(widget: PGtkWidget; target_list:PGtkTargetList); cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 // included by gtk2.pas
 

packages/gtk2/src/gtk+/gtk/gtkentrycompletion.inc

@@ -69,7 +69,6 @@ procedure gtk_entry_completion_delete_action(completion:PGtkEntryCompletion; ind
 { convenience  }
 procedure gtk_entry_completion_set_text_column(completion:PGtkEntryCompletion; column:gint);cdecl;external gtklib name 'gtk_entry_completion_set_text_column';
 
-
 {$endif read_interface_rest}
 
 {$ifdef read_implementation}

packages/gtk2/src/gtk+/gtk/gtkeventbox.inc

@@ -31,6 +31,14 @@ function GTK_EVENT_BOX_GET_CLASS(obj: pointer) : PGtkEventBoxClass;
 
 function gtk_event_box_get_type:TGtkType; cdecl; external gtklib;
 function gtk_event_box_new:PGtkWidget; cdecl; external gtklib;
+
+{$ifdef HasGTK2_4}
+function gtk_event_box_get_above_child(event_box:PGtkEventBox):gboolean; cdecl; external gtklib;
+procedure gtk_event_box_set_above_child(event_box: PGtkEventBox; above_child:gboolean); cdecl; external gtklib;
+procedure gtk_event_box_set_visible_window(event_box:PGtkEventBox; visible_window:gboolean); cdecl; external gtklib;
+function gtk_event_box_get_visible_window(event_box:PGtkEventBox):gboolean; cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtkexpander.inc

@@ -62,7 +62,6 @@ function gtk_expander_get_label_widget(expander:PGtkExpander):PGtkWidget;cdecl;e
 
 {$ifdef read_implementation}
 
-
 function GTK_TYPE_EXPANDER : GType;
 begin
    GTK_TYPE_EXPANDER:=gtk_expander_get_type;

packages/gtk2/src/gtk+/gtk/gtkfilechooser.inc

@@ -24,15 +24,11 @@ type
 {$IFDEF read_interface_rest}
 
 function GTK_TYPE_FILE_CHOOSER: GType;
-
 function GTK_FILE_CHOOSER(obj : pointer) : PGtkFileChooser;
-
 function GTK_IS_FILE_CHOOSER(obj : pointer) : gboolean;
-
 function GTK_FILE_CHOOSER_ERROR : TGQuark;
 
 
-
 function gtk_file_chooser_get_type:GType;cdecl;external gtklib name 'gtk_file_chooser_get_type';
 
 
@@ -127,28 +123,24 @@ procedure gtk_file_chooser_set_do_overwrite_confirmation(chooser:PGtkFileChooser
 
 {$IFDEF read_implementation}
 
-    function GTK_TYPE_FILE_CHOOSER: GType;
-    begin
-        GTK_TYPE_FILE_CHOOSER:=gtk_file_chooser_get_type;
-    end;
-
-    function GTK_FILE_CHOOSER(obj : pointer) : PGtkFileChooser;
-    begin
-       GTK_FILE_CHOOSER:=G_TYPE_CHECK_INSTANCE_CAST(obj, GTK_TYPE_FILE_CHOOSER);
-    end;
-
-
-
-    function GTK_IS_FILE_CHOOSER(obj : pointer) : gboolean;
-    begin
-       GTK_IS_FILE_CHOOSER:=G_TYPE_CHECK_INSTANCE_TYPE(obj,GTK_TYPE_FILE_CHOOSER);
-    end;
+function GTK_TYPE_FILE_CHOOSER: GType;
+begin
+   GTK_TYPE_FILE_CHOOSER:=gtk_file_chooser_get_type;
+end;
 
+function GTK_FILE_CHOOSER(obj : pointer) : PGtkFileChooser;
+begin
+   GTK_FILE_CHOOSER:=G_TYPE_CHECK_INSTANCE_CAST(obj, GTK_TYPE_FILE_CHOOSER);
+end;
 
-    function GTK_FILE_CHOOSER_ERROR : TGQuark;
+function GTK_IS_FILE_CHOOSER(obj : pointer) : gboolean;
+begin
+   GTK_IS_FILE_CHOOSER:=G_TYPE_CHECK_INSTANCE_TYPE(obj,GTK_TYPE_FILE_CHOOSER);
+end;
 
-      begin
-         GTK_FILE_CHOOSER_ERROR:=gtk_file_chooser_error_quark;
-      end;
+function GTK_FILE_CHOOSER_ERROR : TGQuark;
+begin
+   GTK_FILE_CHOOSER_ERROR:=gtk_file_chooser_error_quark;
+end;
 
-{$ENDIF} {read_implementation}
+{$ENDIF}

packages/gtk2/src/gtk+/gtk/gtkfilechooserdialog.inc

@@ -19,7 +19,6 @@ type
 
 {$IFDEF read_interface_rest}
 
-
 function GTK_TYPE_FILE_CHOOSER_DIALOG : GType;
 function GTK_FILE_CHOOSER_DIALOG(obj : pointer) : PGtkFileChooserDialog;
 function GTK_FILE_CHOOSER_DIALOG_CLASS(klass : pointer) : PGtkFileChooserDialogClass;
@@ -28,7 +27,6 @@ function GTK_IS_FILE_CHOOSER_DIALOG_CLASS(klass : pointer) : gboolean;
 function GTK_FILE_CHOOSER_DIALOG_GET_CLASS(obj : pointer) : PGtkFileChooserDialogClass;
 
 
-
 function gtk_file_chooser_dialog_get_type:GType;cdecl;external gtklib name 'gtk_file_chooser_dialog_get_type';
 
 function gtk_file_chooser_dialog_new(title:Pgchar; parent:PGtkWindow; action:TGtkFileChooserAction; first_button_text:Pgchar; args:array of const):PGtkWidget;cdecl;overload;external gtklib name 'gtk_file_chooser_dialog_new';
@@ -45,11 +43,9 @@ function gtk_file_chooser_dialog_new_with_backend(title:Pgchar; parent:PGtkWindo
 {$IFDEF read_implementation}
 
 function GTK_TYPE_FILE_CHOOSER_DIALOG : GType;
-  begin
-     GTK_TYPE_FILE_CHOOSER_DIALOG:=gtk_file_chooser_dialog_get_type;
-  end;
-
-
+begin
+   GTK_TYPE_FILE_CHOOSER_DIALOG:=gtk_file_chooser_dialog_get_type;
+end;
 
 function GTK_FILE_CHOOSER_DIALOG(obj : pointer) : PGtkFileChooserDialog;
 begin
@@ -61,7 +57,6 @@ begin
    GTK_FILE_CHOOSER_DIALOG_CLASS:=G_TYPE_CHECK_CLASS_CAST(klass,GTK_TYPE_FILE_CHOOSER_DIALOG);
 end;
 
-
 function GTK_IS_FILE_CHOOSER_DIALOG(obj : pointer) : gboolean;
 begin
    GTK_IS_FILE_CHOOSER_DIALOG:=G_TYPE_CHECK_INSTANCE_TYPE(obj,GTK_TYPE_FILE_CHOOSER_DIALOG);
@@ -77,5 +72,4 @@ begin
    GTK_FILE_CHOOSER_DIALOG_GET_CLASS:=PGtkFileChooserDialogClass(G_TYPE_INSTANCE_GET_CLASS(obj,GTK_TYPE_FILE_CHOOSER_DIALOG));
 end;
 
-
 {$ENDIF} {read_implementation}

packages/gtk2/src/gtk+/gtk/gtkfilechooserwidget.inc

@@ -24,37 +24,32 @@ type
 
 function GTK_TYPE_FILE_CHOOSER_WIDGET : GType;
 function GTK_FILE_CHOOSER_WIDGET(obj : pointer) : PGtkFileChooserWidget;
-function GTK_FILE_CHOOSER_WIDGET_CLASS(klass : pointer) : PGtkFileChooserWidget;
+function GTK_FILE_CHOOSER_WIDGET_CLASS(klass : pointer) : PGtkFileChooserWidgetClass;
 function GTK_IS_FILE_CHOOSER_WIDGET(obj : pointer) : gboolean;
 function GTK_IS_FILE_CHOOSER_WIDGET_CLASS(klass :pointer) : gboolean;
 function GTK_FILE_CHOOSER_WIDGET_GET_CLASS(obj : pointer) : PGtkFileChooserWidgetClass;
 
-
-
 function gtk_file_chooser_widget_get_type:GType;cdecl;external gtklib name 'gtk_file_chooser_widget_get_type';
 function gtk_file_chooser_widget_new(action:TGtkFileChooserAction):PGtkWidget;cdecl;external gtklib name 'gtk_file_chooser_widget_new';
 function gtk_file_chooser_widget_new_with_backend(action:TGtkFileChooserAction; backend:Pgchar):PGtkWidget;cdecl;external gtklib name 'gtk_file_chooser_widget_new_with_backend';
-{$endif} {read_interface_rest}
+
+{$endif}
 
 {$IFDEF read_implementation}
 
 function GTK_TYPE_FILE_CHOOSER_WIDGET : GType;
-  begin
-     GTK_TYPE_FILE_CHOOSER_WIDGET:=gtk_file_chooser_widget_get_type;
-  end;
+begin
+   GTK_TYPE_FILE_CHOOSER_WIDGET:=gtk_file_chooser_widget_get_type;
+end;
 
 function GTK_FILE_CHOOSER_WIDGET(obj : pointer) : PGtkFileChooserWidget;
 begin
    GTK_FILE_CHOOSER_WIDGET:=PGtkFileChooserWidget(G_TYPE_CHECK_INSTANCE_CAST(obj,GTK_TYPE_FILE_CHOOSER_WIDGET));
 end;
 
-{ ToDO:
-  Is the return type right?
-}
-
-function GTK_FILE_CHOOSER_WIDGET_CLASS(klass : pointer) : PGtkFileChooserWidget;
+function GTK_FILE_CHOOSER_WIDGET_CLASS(klass : pointer) : PGtkFileChooserWidgetClass;
 begin
-   GTK_FILE_CHOOSER_WIDGET_CLASS:=PGtkFileChooserWidget(G_TYPE_CHECK_CLASS_CAST(klass,GTK_TYPE_FILE_CHOOSER_WIDGET));
+   GTK_FILE_CHOOSER_WIDGET_CLASS:=PGtkFileChooserWidgetClass(G_TYPE_CHECK_CLASS_CAST(klass,GTK_TYPE_FILE_CHOOSER_WIDGET));
 end;
 
 function GTK_IS_FILE_CHOOSER_WIDGET(obj : pointer) : gboolean;
@@ -62,17 +57,14 @@ begin
    GTK_IS_FILE_CHOOSER_WIDGET:=G_TYPE_CHECK_INSTANCE_TYPE(obj,GTK_TYPE_FILE_CHOOSER_WIDGET);
 end;
 
-
 function GTK_IS_FILE_CHOOSER_WIDGET_CLASS(klass :pointer) : gboolean;
 begin
    GTK_IS_FILE_CHOOSER_WIDGET_CLASS:=G_TYPE_CHECK_CLASS_TYPE(klass,GTK_TYPE_FILE_CHOOSER_WIDGET);
 end;
 
-
 function GTK_FILE_CHOOSER_WIDGET_GET_CLASS(obj : pointer) : PGtkFileChooserWidgetClass;
 begin
    GTK_FILE_CHOOSER_WIDGET_GET_CLASS:=PGtkFileChooserWidgetClass (G_TYPE_INSTANCE_GET_CLASS(obj,GTK_TYPE_FILE_CHOOSER_WIDGET));
 end;
 
-
 {$ENDIF}

packages/gtk2/src/gtk+/gtk/gtkfilefilter.inc

@@ -28,12 +28,9 @@ type
 {$ifdef read_interface_rest}
 
 function GTK_TYPE_FILE_FILTER : GType;
-
 function GTK_FILE_FILTER(obj : pointer) : PGtkFileFilter;
-
 function GTK_IS_FILE_FILTER(obj : pointer) : gboolean;
 
-
 function gtk_file_filter_get_type:GType;cdecl;external gtklib name 'gtk_file_filter_get_type';
 function gtk_file_filter_new:PGtkFileFilter;cdecl;external gtklib name 'gtk_file_filter_new';
 
@@ -54,9 +51,9 @@ function gtk_file_filter_filter(filter:PGtkFileFilter; filter_info:PGtkFileFilte
 {$ifdef read_implementation}
 
 function GTK_TYPE_FILE_FILTER : GType;
-  begin
-     GTK_TYPE_FILE_FILTER:=gtk_file_filter_get_type;
-  end;
+begin
+   GTK_TYPE_FILE_FILTER:=gtk_file_filter_get_type;
+end;
 
 function GTK_FILE_FILTER(obj : pointer) : PGtkFileFilter;
 begin

packages/gtk2/src/gtk+/gtk/gtkfontbutton.inc

@@ -65,6 +65,7 @@ procedure gtk_font_button_set_show_size(font_button:PGtkFontButton; show_size:gb
 {$endif read_interface_rest}
 
 {$ifdef read_implementation}
+
 function GTK_TYPE_FONT_BUTTON : GType;
 begin
    GTK_TYPE_FONT_BUTTON:=gtk_font_button_get_type;

packages/gtk2/src/gtk+/gtk/gtkicontheme.inc

@@ -119,6 +119,7 @@ function gtk_icon_info_get_display_name(icon_info:PGtkIconInfo):Pgchar;cdecl;ext
 {$ENDIF read_interface_rest}
 
 {$ifdef read_implementation}
+
 function GTK_TYPE_ICON_INFO : GType;
 begin
    GTK_TYPE_ICON_INFO:=gtk_icon_info_get_type;

packages/gtk2/src/gtk+/gtk/gtkincludes.inc

@@ -203,6 +203,7 @@
 {$include gtkcelllayout.inc}
 {$include gtkentrycompletion.inc}
 {$include gtkuimanager.inc}
+{$include gtkseparatortoolitem.inc}
 {$include gtktreemodelfilter.inc}
 
 

packages/gtk2/src/gtk+/gtk/gtkmenu.inc

@@ -157,6 +157,12 @@ procedure gtk_menu_insert(menu,child: PGtkWidget; pos : gint);
 {$IFDEF HasGTK2_2}
 procedure gtk_menu_set_screen(menu:PGtkMenu; screen:PGdkScreen); cdecl; external gtklib;
 {$ENDIF}
+
+{$ifdef HasGTK2_4}
+procedure gtk_menu_attach(menu: PGtkMenu; child: PGtkWidget; left_attach: guint; right_attach: guint; top_attach: guint; bottom_attach: guint); cdecl; external gtklib;
+procedure gtk_menu_set_monitor(menu: PGtkMenu; monitor_num: gint); cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtkmessagedialog.inc

@@ -69,6 +69,14 @@ function gtk_message_dialog_new(parent:PGtkWindow; flags:TGtkDialogFlags;
   _type:TGtkMessageType; buttons:TGtkButtonsType;
   message_format:Pgchar):PGtkWidget; varargs; cdecl; external gtklib;
 {$ENDIF}
+
+{$ifdef HasGTK2_4}
+function gtk_message_dialog_new_with_markup(parent: PGtkWindow; flags: TGtkDialogFlags;
+  _type: TGtkMessageType; buttons: TGtkButtonsType; 
+  message_format: Pgchar): PGtkWidget; varargs; cdecl; external gtklib;
+procedure gtk_message_dialog_set_markup(message_dialog: PGtkMessageDialog; str:Pgchar); cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtkpaned.inc

@@ -113,6 +113,11 @@ procedure gtk_paned_set_gutter_size(p: pointer; s : gint);
 {$endif}
 { GTK_DISABLE_DEPRECATED  }
 
+{$ifdef HasGTK2_4}
+function gtk_paned_get_child1(paned: PGtkPaned): PGtkWidget; cdecl; external gtklib;
+function gtk_paned_get_child2(paned: PGtkPaned): PGtkWidget; cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtkradioaction.inc

@@ -28,35 +28,28 @@ type
 {$ENDIF read_interface_types}
 
 {$IFDEF read_interface_rest}
-function GTK_TYPE_RADIO_ACTION : GType;
 
+function GTK_TYPE_RADIO_ACTION : GType;
 function GTK_RADIO_ACTION(obj : pointer) : PGtkRadioAction;
-
 function GTK_RADIO_ACTION_CLASS(klass : pointer) : PGtkRadioActionClass;
-
 function GTK_IS_RADIO_ACTION(obj : pointer) : gboolean;
-
 function GTK_IS_RADIO_ACTION_CLASS(klass : pointer) : gboolean;
-
 function GTK_RADIO_ACTION_GET_CLASS(obj : pointer) : PGtkRadioActionClass;
 
 function gtk_radio_action_get_type:GType;cdecl;external gtklib name 'gtk_radio_action_get_type';
-
 function gtk_radio_action_new(name:Pgchar; szLabel:Pgchar; tooltip:Pgchar; stock_id:Pgchar; value:gint):PGtkRadioAction;cdecl;external gtklib name 'gtk_radio_action_new';
-
 function gtk_radio_action_get_group(action:PGtkRadioAction):PGSList;cdecl;external gtklib name 'gtk_radio_action_get_group';
-
 procedure gtk_radio_action_set_group(action:PGtkRadioAction; group:PGSList);cdecl;external gtklib name 'gtk_radio_action_set_group';
-
 function gtk_radio_action_get_current_value(action:PGtkRadioAction):gint;cdecl;external gtklib name 'gtk_radio_action_get_current_value';
 
 {$ENDIF read_interface_rest}
 
 {$IFDEF read_implementation}
+
 function GTK_TYPE_RADIO_ACTION : GType;
-  begin
-     GTK_TYPE_RADIO_ACTION:=gtk_radio_action_get_type;
-  end;
+begin
+   GTK_TYPE_RADIO_ACTION:=gtk_radio_action_get_type;
+end;
 
 function GTK_RADIO_ACTION(obj : pointer) : PGtkRadioAction;
 begin

packages/gtk2/src/gtk+/gtk/gtkradiotoolbutton.inc

@@ -22,6 +22,7 @@ type
 {$ENDIF read_interface_types}
 
 {$IFDEF read_interface_rest}
+
 function GTK_TYPE_RADIO_TOOL_BUTTON : GType;
 function GTK_RADIO_TOOL_BUTTON(obj : pointer) : PGtkRadioToolButton;
 function GTK_RADIO_TOOL_BUTTON_CLASS(klass : pointer) : PGtkRadioToolButtonClass;
@@ -69,11 +70,9 @@ begin
    GTK_IS_RADIO_TOOL_BUTTON_CLASS:=G_TYPE_CHECK_CLASS_TYPE(klass,GTK_TYPE_RADIO_TOOL_BUTTON);
 end;
 
-
 function GTK_RADIO_TOOL_BUTTON_GET_CLASS(obj : pointer) : PGtkRadioToolButtonClass;
 begin
    GTK_RADIO_TOOL_BUTTON_GET_CLASS:=PGtkRadioToolButtonClass(G_TYPE_INSTANCE_GET_CLASS(obj,GTK_TYPE_RADIO_TOOL_BUTTON));
 end;
 
-
 {$endif read_implementation}

packages/gtk2/src/gtk+/gtk/gtkrc.inc

@@ -181,6 +181,11 @@ function gtk_rc_parse_priority(scanner:PGScanner; priority:PGtkPathPriorityType)
 
 function _gtk_rc_style_lookup_rc_property(rc_style:PGtkRcStyle; type_name:TGQuark; property_name:TGQuark):PGtkRcProperty; cdecl; external gtklib;
 function _gtk_rc_context_get_default_font_name(settings:PGtkSettings):Pgchar; cdecl; external gtklib;
+
+{$ifdef HasGTK2_4}
+procedure gtk_rc_reset_styles(settings: PGtkSettings); cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtkscale.inc

@@ -60,6 +60,12 @@ procedure gtk_scale_set_value_pos(scale:PGtkScale; pos:TGtkPositionType); cdecl;
 function gtk_scale_get_value_pos(scale:PGtkScale):TGtkPositionType; cdecl; external gtklib;
 procedure _gtk_scale_get_value_size(scale:PGtkScale; width:Pgint; height:Pgint); cdecl; external gtklib;
 function _gtk_scale_format_value(scale:PGtkScale; value:gdouble):Pgchar; cdecl; external gtklib;
+
+{$ifdef HasGTK2_4}
+function gtk_scale_get_layout(scale: PGtkScale): PPangoLayout; cdecl; external gtklib;
+procedure gtk_scale_get_layout_offsets(scale: PGtkScale; x: Pgint; y: Pgint); cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtkseparatortoolitem.inc

@@ -0,0 +1,81 @@
+// included by gtk2.pas
+
+{$IFDEF read_forward_definitions}
+{$ENDIF read_forward_definitions}
+
+//------------------------------------------------------------------------------
+
+{$IFDEF read_interface_types}
+  PGtkSeparatorToolItemPrivate = pointer;
+
+  PGtkSeparatorToolItem = ^TGtkSeparatorToolItem;
+  TGtkSeparatorToolItem = record
+       parent : TGtkToolItem;
+       priv : PGtkSeparatorToolItemPrivate;
+    end;
+
+
+  PGtkSeparatorToolItemClass = ^TGtkSeparatorToolItemClass;
+  TGtkSeparatorToolItemClass = record
+       parent_class : TGtkToolItemClass;
+       _gtk_reserved1 : procedure ;cdecl;
+       _gtk_reserved2 : procedure ;
+       _gtk_reserved3 : procedure ;
+       _gtk_reserved4 : procedure ;
+    end;
+
+{$ENDIF read_interface_types}
+
+//------------------------------------------------------------------------------
+
+{$IFDEF read_interface_rest}
+
+function GTK_TYPE_SEPARATOR_TOOL_ITEM : GType;
+function GTK_SEPARATOR_TOOL_ITEM(obj : pointer) : PGtkSeparatorToolItem;
+function GTK_SEPARATOR_TOOL_ITEM_CLASS(klass : pointer) : PGtkSeparatorToolItemClass;
+function GTK_IS_SEPARATOR_TOOL_ITEM(obj : pointer) : boolean;
+function GTK_IS_SEPARATOR_TOOL_ITEM_CLASS(klass : pointer) : boolean;
+function GTK_SEPARATOR_TOOL_ITEM_GET_CLASS(obj : pointer) : PGtkSeparatorToolItemClass;
+
+function gtk_separator_tool_item_get_type: GType; cdecl; external gtklib;
+function gtk_separator_tool_item_new:PGtkToolItem; cdecl; external gtklib;
+function gtk_separator_tool_item_get_draw(item:PGtkSeparatorToolItem):gboolean; cdecl; external gtklib;
+procedure gtk_separator_tool_item_set_draw(item:PGtkSeparatorToolItem; draw:gboolean); cdecl; external gtklib;
+
+{$endif}
+
+//------------------------------------------------------------------------------
+
+{$IFDEF read_implementation}
+
+function GTK_TYPE_SEPARATOR_TOOL_ITEM : GType;
+begin
+  GTK_TYPE_SEPARATOR_TOOL_ITEM := gtk_separator_tool_item_get_type;
+end;
+
+function GTK_SEPARATOR_TOOL_ITEM(obj : pointer) : PGtkSeparatorToolItem;
+begin
+  GTK_SEPARATOR_TOOL_ITEM:=PGtkSeparatorToolItem(G_TYPE_CHECK_INSTANCE_CAST(obj,GTK_TYPE_SEPARATOR_TOOL_ITEM));
+end;
+
+function GTK_SEPARATOR_TOOL_ITEM_CLASS(klass : pointer) : PGtkSeparatorToolItemClass;
+begin
+  GTK_SEPARATOR_TOOL_ITEM_CLASS:=PGtkSeparatorToolItemClass(G_TYPE_CHECK_CLASS_CAST(klass,GTK_TYPE_SEPARATOR_TOOL_ITEM));
+end;
+
+function GTK_IS_SEPARATOR_TOOL_ITEM(obj : pointer) : boolean;
+begin
+  GTK_IS_SEPARATOR_TOOL_ITEM:=G_TYPE_CHECK_INSTANCE_TYPE(obj,GTK_TYPE_SEPARATOR_TOOL_ITEM);
+end;
+
+function GTK_IS_SEPARATOR_TOOL_ITEM_CLASS(klass : pointer) : boolean;
+begin
+  GTK_IS_SEPARATOR_TOOL_ITEM_CLASS:=G_TYPE_CHECK_CLASS_TYPE(klass,GTK_TYPE_SEPARATOR_TOOL_ITEM);
+end;
+
+function GTK_SEPARATOR_TOOL_ITEM_GET_CLASS(obj : pointer) : PGtkSeparatorToolItemClass;
+begin
+  GTK_SEPARATOR_TOOL_ITEM_GET_CLASS:=PGtkSeparatorToolItemClass(G_TYPE_INSTANCE_GET_CLASS(obj,GTK_TYPE_SEPARATOR_TOOL_ITEM));
+end;
+
+{$ENDIF}

packages/gtk2/src/gtk+/gtk/gtkstock.inc

@@ -20,6 +20,7 @@
 
 {$IFDEF read_interface_rest}
 const
+   GTK_STOCK_DIALOG_AUTHENTICATION = 'gtk-dialog-authentication';
    GTK_STOCK_DIALOG_INFO = 'gtk-dialog-info';
    GTK_STOCK_DIALOG_WARNING = 'gtk-dialog-warning';
    GTK_STOCK_DIALOG_ERROR = 'gtk-dialog-error';
@@ -52,9 +53,12 @@ const
    GTK_STOCK_GO_DOWN = 'gtk-go-down';
    GTK_STOCK_GO_FORWARD = 'gtk-go-forward';
    GTK_STOCK_GO_UP = 'gtk-go-up';
+   GTK_STOCK_HARDDISK = 'gtk-harddisk';
    GTK_STOCK_HELP = 'gtk-help';
    GTK_STOCK_HOME = 'gtk-home';
    GTK_STOCK_INDEX = 'gtk-index';
+   GTK_STOCK_INDENT = 'gtk-indent';
+   GTK_STOCK_UNINDENT = 'gtk-unindent';
    GTK_STOCK_ITALIC = 'gtk-italic';
    GTK_STOCK_JUMP_TO = 'gtk-jump-to';
    GTK_STOCK_JUSTIFY_CENTER = 'gtk-justify-center';
@@ -70,6 +74,7 @@ const
 	 GTK_STOCK_MEDIA_REWIND = 'gtk-media-rewind';
 	 GTK_STOCK_MEDIA_STOP = 'gtk-media-stop';
    GTK_STOCK_MISSING_IMAGE = 'gtk-missing-image';
+   GTK_STOCK_NETWORK = 'gtk-network';
    GTK_STOCK_NEW = 'gtk-new';
    GTK_STOCK_NO = 'gtk-no';
    GTK_STOCK_OK = 'gtk-ok';

packages/gtk2/src/gtk+/gtk/gtkstyle.inc

@@ -336,6 +336,11 @@ procedure gtk_paint_string(style:PGtkStyle; window:PGdkWindow; state_type:TGtkSt
 function _gtk_get_insertion_cursor_gc(widget:PGtkWidget; is_primary:gboolean):PGdkGC; cdecl; external gtklib;
 procedure _gtk_draw_insertion_cursor(widget:PGtkWidget; drawable:PGdkDrawable; gc:PGdkGC; location:PGdkRectangle; direction:TGtkTextDirection;
             draw_arrow:gboolean); cdecl; external gtklib;
+
+{$ifdef HasGTK2_4}
+procedure gtk_draw_insertion_cursor(widget:PGtkWidget; drawable:PGdkDrawable; area:PGdkRectangle; location:PGdkRectangle; is_primary:gboolean;
+            direction:TGtkTextDirection; draw_arrow:gboolean); cdecl; external gtklib;
+{$endif}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtktextbuffer.inc

@@ -176,6 +176,11 @@ procedure _gtk_text_buffer_spew(buffer:PGtkTextBuffer); cdecl; external gtklib;
 function _gtk_text_buffer_get_btree(buffer:PGtkTextBuffer):PGtkTextBTree; cdecl; external gtklib;
 function _gtk_text_buffer_get_line_log_attrs(buffer:PGtkTextBuffer; anywhere_in_line:PGtkTextIter; char_len:Pgint):PPangoLogAttr; cdecl; external gtklib;
 procedure _gtk_text_buffer_notify_will_remove_tag(buffer:PGtkTextBuffer; tag:PGtkTextTag); cdecl; external gtklib;
+
+{$ifdef HasGTK2_4}
+procedure gtk_text_buffer_select_range(buffer: PGtkTextBuffer; ins: PGtkTextIter; bound: PGtkTextIter); cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtktextiter.inc

@@ -172,6 +172,18 @@ function gtk_text_iter_compare(lhs:PGtkTextIter; rhs:PGtkTextIter):gint; cdecl;
 function gtk_text_iter_in_range(iter:PGtkTextIter; start:PGtkTextIter; theEnd:PGtkTextIter):gboolean; cdecl; external gtklib;
 { Put these two in ascending order  }
 procedure gtk_text_iter_order(first:PGtkTextIter; second:PGtkTextIter); cdecl; external gtklib;
+
+{$ifdef HasGTK2_4}
+function gtk_text_iter_backward_visible_cursor_position(iter:PGtkTextIter):gboolean; cdecl; external gtklib;
+function gtk_text_iter_backward_visible_cursor_positions(iter:PGtkTextIter; count:gint):gboolean; cdecl; external gtklib;
+function gtk_text_iter_backward_visible_word_start(iter:PGtkTextIter):gboolean; cdecl; external gtklib;
+function gtk_text_iter_backward_visible_word_starts(iter:PGtkTextIter; count:gint):gboolean; cdecl; external gtklib;
+function gtk_text_iter_forward_visible_cursor_position(iter:PGtkTextIter):gboolean; cdecl; external gtklib;
+function gtk_text_iter_forward_visible_cursor_positions(iter:PGtkTextIter; count:gint):gboolean; cdecl; external gtklib;
+function gtk_text_iter_forward_visible_word_end(iter:PGtkTextIter):gboolean; cdecl; external gtklib;
+function gtk_text_iter_forward_visible_word_ends(iter:PGtkTextIter; count:gint):gboolean; cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtktoolbar.inc

@@ -121,10 +121,17 @@ function gtk_toolbar_get_style(toolbar:PGtkToolbar):TGtkToolbarStyle; cdecl; ext
 function gtk_toolbar_get_icon_size(toolbar:PGtkToolbar):TGtkIconSize; cdecl; external gtklib;
 function gtk_toolbar_get_tooltips(toolbar:PGtkToolbar):gboolean; cdecl; external gtklib;
 
-{$IFDEF HasGTK2_4}
-function gtk_separator_tool_item_get_type:TGtkType; cdecl; external gtklib;
-function GTK_TYPE_SEPARATOR_TOOL_ITEM : GType;
-{$ENDIF HasGTK2_4}
+{$ifdef HasGTK2_4}
+function gtk_toolbar_get_drop_index(toolbar:PGtkToolbar; x:gint; y:gint):gint; cdecl; external gtklib;
+function gtk_toolbar_get_item_index(toolbar:PGtkToolbar; item:PGtkToolItem):gint; cdecl; external gtklib;
+function gtk_toolbar_get_nth_item(toolbar:PGtkToolbar; n:gint):PGtkToolItem; cdecl; external gtklib;
+function gtk_toolbar_get_n_items(toolbar:PGtkToolbar):gint; cdecl; external gtklib;
+function gtk_toolbar_get_relief_style(toolbar:PGtkToolbar):TGtkReliefStyle; cdecl; external gtklib;
+function gtk_toolbar_get_show_arrow(toolbar:PGtkToolbar):gboolean; cdecl; external gtklib;
+procedure gtk_toolbar_insert(toolbar:PGtkToolbar; item:PGtkToolItem; pos:gint); cdecl; external gtklib;
+procedure gtk_toolbar_set_drop_highlight_item(toolbar:PGtkToolbar; tool_item:PGtkToolItem; index_:gint); cdecl; external gtklib;
+procedure gtk_toolbar_set_show_arrow(toolbar:PGtkToolbar; show_arrow:gboolean); cdecl; external gtklib;
+{$endif}
 
 {$ENDIF read_interface_rest}
 
@@ -181,13 +188,6 @@ begin
    a.flag0:=a.flag0 or ((__icon_size_set shl bp_TGtkToolbar_icon_size_set) and bm_TGtkToolbar_icon_size_set);
 end;
 
-{$IFDEF HasGTK2_4}
-function GTK_TYPE_SEPARATOR_TOOL_ITEM : GType;
-begin
-  GTK_TYPE_SEPARATOR_TOOL_ITEM:=gtk_separator_tool_item_get_type;
-end;
-{$ENDIF HasGTK2_4}
-
 {$ENDIF read_implementation}
 // included by gtk2.pas
 

packages/gtk2/src/gtk+/gtk/gtktooltips.inc

@@ -6,6 +6,7 @@
 //------------------------------------------------------------------------------
 
 {$IFDEF read_interface_types}
+   PPGtkTooltips = ^PGtkTooltips;
    PGtkTooltips = ^TGtkTooltips;
 
    PGtkTooltipsData = ^TGtkTooltipsData;
@@ -84,6 +85,11 @@ procedure gtk_tooltips_set_tip(tooltips:PGtkTooltips; widget:PGtkWidget; tip_tex
 function gtk_tooltips_data_get(widget:PGtkWidget):PGtkTooltipsData; cdecl; external gtklib;
 procedure gtk_tooltips_force_window(tooltips:PGtkTooltips); cdecl; external gtklib;
 procedure _gtk_tooltips_toggle_keyboard_mode(widget:PGtkWidget); cdecl; external gtklib;
+
+{$ifdef HasGTK2_4}
+function gtk_tooltips_get_info_from_tip_window(tip_window:PGtkWindow; tooltips:PPGtkTooltips; current_widget:PPGtkWidget):gboolean; cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtktreeviewcolumn.inc

@@ -186,9 +186,10 @@ function gtk_tree_view_column_cell_is_visible(tree_column:PGtkTreeViewColumn):gb
 procedure gtk_tree_view_column_focus_cell(tree_column:PGtkTreeViewColumn; cell:PGtkCellRenderer); cdecl; external gtklib;
 {$ENDIF}
 
-// since gtk 2.4
+{$ifdef HasGTK2_4}
 procedure gtk_tree_view_column_set_expand(tree_column: PGtkTreeViewColumn; Expand : gboolean); cdecl; external gtklib;
 function gtk_tree_view_column_get_expand(tree_column: PGtkTreeViewColumn): gboolean; cdecl; external gtklib;
+{$endif}
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtkwidget.inc

@@ -1,6 +1,7 @@
 // included by gtk2.pas
 
 {$IFDEF read_forward_definitions}
+   PPGtkWidget = ^PGtkWidget;
    PGtkWidget = ^TGtkWidget;
 {$ENDIF read_forward_definitions}
 
@@ -540,6 +541,17 @@ function gtk_widget_get_root_window(widget:PGtkWidget):PGdkWindow; cdecl; extern
 function gtk_widget_get_screen(widget:PGtkWidget):PGdkScreen; cdecl; external gtklib;
 function gtk_widget_has_screen(widget:PGtkWidget):gboolean; cdecl; external gtklib;
 {$ENDIF}
+
+{$ifdef HasGTK2_4}
+procedure gtk_widget_add_mnemonic_label(widget:PGtkWidget; _label:PGtkWidget); cdecl; external gtklib;
+function gtk_widget_can_activate_accel(widget:PGtkWidget; signal_id:guint):gboolean; cdecl; external gtklib;
+function gtk_widget_get_no_show_all(widget:PGtkWidget):gboolean; cdecl; external gtklib;
+function gtk_widget_list_mnemonic_labels(widget:PGtkWidget):PGList; cdecl; external gtklib;
+procedure gtk_widget_queue_resize_no_redraw(widget:PGtkWidget); cdecl; external gtklib;
+procedure gtk_widget_remove_mnemonic_label(widget:PGtkWidget; _label:PGtkWidget); cdecl; external gtklib;
+procedure gtk_widget_set_no_show_all(widget:PGtkWidget; no_show_all:gboolean); cdecl; external gtklib;
+{$endif}
+
 {$ENDIF read_interface_rest}
 
 //------------------------------------------------------------------------------

packages/gtk2/src/gtk+/gtk/gtkwindow.inc

@@ -235,8 +235,6 @@ procedure gtk_window_unmaximize(window:PGtkWindow); cdecl; external gtklib;
 {$ifdef HasGTK2_2}
 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;
 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;
@@ -297,6 +295,9 @@ function gtk_window_get_accept_focus(window:PGtkWindow):gboolean; cdecl; externa
 procedure gtk_window_set_accept_focus(window:PGtkWindow; setting:gboolean); cdecl; external gtklib;
 function gtk_window_has_toplevel_focus(window: PGtkWindow):gboolean;cdecl; external gtklib;
 function gtk_window_is_active(window: PGtkWindow):gboolean; cdecl; external gtklib;
+procedure gtk_window_set_default_icon(icon:PGdkPixbuf); 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;
 {$ENDIF HasGTK2_4}