Fixes from Tsvetoslav Petrov

git-svn-id: trunk@3652 -

packages/extra/gtk2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/23]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/05/20]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince powerpc64-linux

packages/extra/gtk2/gtk+/gdk-pixbuf/gdk2pixbuf.pas

@@ -61,6 +61,9 @@ const
   {$endif}
 {$endif}
 
+{$define HasGTK2_4}
+{$define HasGTK2_6}
+
 { Pointers to basic pascal types, inserted by h2pas conversion program.}
 {$IFNDEF KYLIX}
   {$PACKRECORDS C}
@@ -72,11 +75,17 @@ const
 
 {$IFNDEF Kylix}
 var
+  {$IFDEF WIN32 }
+  gdk_pixbuf_major_version: guint; external gdkpixbuflib name 'gdk_pixbuf_major_version';
+  gdk_pixbuf_minor_version: guint; external gdkpixbuflib name 'gdk_pixbuf_minor_version';
+  gdk_pixbuf_micro_version: guint; external gdkpixbuflib name 'gdk_pixbuf_micro_version';
+  gdk_pixbuf_version: PChar ; external gdkpixbuflib name 'gdk_pixbuf_version';
+  {$ELSE }
   gdk_pixbuf_major_version: guint;cvar;external;
   gdk_pixbuf_minor_version: guint;cvar;external;
   gdk_pixbuf_micro_version: guint;cvar;external;
-
   gdk_pixbuf_version: PChar;cvar;external;
+  {$ENDIF }
 {$ENDIF}
 
 type
@@ -180,6 +189,13 @@ function gdk_pixbuf_new_from_data(data:Pguchar; colorspace:TGdkColorspace; has_a
 function gdk_pixbuf_new_from_xpm_data(data:PPchar):PGdkPixbuf; cdecl; external gdkpixbuflib;
 function gdk_pixbuf_new_from_inline(data_length:gint; var data:guint8; copy_pixels:gboolean; error:PPGError):PGdkPixbuf; cdecl; external gdkpixbuflib;
 
+{$IFDEF HasGTK2_4}
+function gdk_pixbuf_new_from_file_at_size(filename:Pchar; width, height: gint;error:PPGError):PGdkPixbuf; cdecl; external gdkpixbuflib;
+{$ENDIF HasGTK2_4}
+{$IFDEF HasGTK2_6}
+function gdk_pixbuf_new_from_file_at_scale(filename:Pchar; width, height: gint; preserve_aspect_ratio: gboolean; error:PPGError):PGdkPixbuf; cdecl; external gdkpixbuflib;
+{$ENDIF HasGTK2_6}
+
 { Mutations  }
 procedure gdk_pixbuf_fill(pixbuf:PGdkPixbuf; pixel:guint32); cdecl; external gdkpixbuflib;
 

packages/extra/gtk2/gtk+/gtk/gtk2.pas

@@ -18,7 +18,8 @@
   }
 unit gtk2; // keep unit name lowercase for kylix
 
-{$define GTK2_2}
+// default GTK2_6
+{$define GTK2_6}
 
 { Smartlinking has problems on powerpc-linux because of commandline length, disable
   it for now }

packages/extra/gtk2/gtk+/gtk/gtkentry.inc

@@ -166,6 +166,8 @@ procedure gtk_entry_get_layout_offsets(entry:PGtkEntry; x:Pgint; y:Pgint); cdecl
 {$IFDEF HasGTK2_4}
 function gtk_entry_get_alignment(window:PGtkEntry): GFloat; cdecl; external gtklib;
 procedure gtk_entry_set_alignment(window:PGtkEntry; xalign: GFloat); cdecl; external gtklib;
+function gtk_entry_get_completion(entry:PGtkEntry): PGtkEntryCompletion; cdecl; external gtklib;
+procedure gtk_entry_set_completion(entry:PGtkEntry; entryCompletion: PGtkEntryCompletion); cdecl; external gtklib;
 {$ENDIF HasGTK2_4}
 
 { Deprecated compatibility functions }

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

@@ -160,7 +160,9 @@
 {$include gtkfilechooserentry.inc}
 {$include gtkiconview.inc}
 
-{$ENDIF}
+// new GtkCellRendererCombo widget
+{$include gtkcellrenderercombo.inc}
+{$ENDIF HasGTK2_6}
 
 {$include gtkfilechooser.inc}
 

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

@@ -26,6 +26,7 @@ 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_APPLY = 'gtk-apply';
    GTK_STOCK_BOLD = 'gtk-bold';
@@ -33,7 +34,9 @@ const
    GTK_STOCK_CDROM = 'gtk-cdrom';
    GTK_STOCK_CLEAR = 'gtk-clear';
    GTK_STOCK_CLOSE = 'gtk-close';
+	 GTK_STOCK_COLOR_PICKER = 'gtk-color-picker';
    GTK_STOCK_CONVERT = 'gtk-convert';
+	 GTK_STOCK_CONNECT = 'gtk-connect';
    GTK_STOCK_COPY = 'gtk-copy';
    GTK_STOCK_CUT = 'gtk-cut';
    GTK_STOCK_DELETE = 'gtk-delete';
@@ -58,6 +61,14 @@ 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_MISSING_IMAGE = 'gtk-missing-image';
    GTK_STOCK_NEW = 'gtk-new';
    GTK_STOCK_NO = 'gtk-no';