diff --git a/ChangeLog b/ChangeLog index 4b02d1c08..542cec2ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-01-04 Mike Kestner + + * *: update to 2.14. parser support for GSEALed fields. svn build + now uses bootstrap-2.14. integrate gio-sharp module. + 2009-01-04 Mike Kestner * glib/GType.cs: fix incorrect null check noticed by Christian Hoff. diff --git a/Makefile.am b/Makefile.am index 4ae26d4db..31e4f2423 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = sources generator parser glib cairo pango atk gdk gtk glade gtkdotnet sample doc +SUBDIRS = sources generator parser glib gio cairo pango atk gdk gtk glade gtkdotnet sample doc EXTRA_DIST = \ gtk-sharp.snk \ diff --git a/atk/atk-api-2.12.raw b/atk/atk-api-2.14.raw similarity index 99% rename from atk/atk-api-2.12.raw rename to atk/atk-api-2.14.raw index a33144742..fc55853b5 100644 --- a/atk/atk-api-2.12.raw +++ b/atk/atk-api-2.14.raw @@ -2017,7 +2017,7 @@ - + @@ -2285,10 +2285,10 @@ - + - + diff --git a/bootstrap-2.12 b/bootstrap-2.12 deleted file mode 100755 index ee8a4135e..000000000 --- a/bootstrap-2.12 +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# Run this to set configure.in up for an API version. - -GTK_SHARP_VERSION=2.12.8 -ASSEMBLY_VERSION=2.12.0.0 -POLICY_VERSIONS="2.4 2.6 2.8 2.10" -GTK_REQUIRED_VERSION=2.12.0 -VERSIONCSDEFINES="-define:GTK_SHARP_2_6 -define:GTK_SHARP_2_8 -define:GTK_SHARP_2_10 -define:GTK_SHARP_2_12" -VERSIONCFLAGS="-DGTK_SHARP_2_6 -DGTK_SHARP_2_8 -DGTK_SHARP_2_10 -DGTK_SHARP_2_12" -GTK_API_TAG=2.12 - -. ./bootstrap-generic "$@" diff --git a/bootstrap-2.14 b/bootstrap-2.14 new file mode 100755 index 000000000..8a1e34589 --- /dev/null +++ b/bootstrap-2.14 @@ -0,0 +1,12 @@ +#!/bin/sh +# Run this to set configure.in up for an API version. + +GTK_SHARP_VERSION=2.13.90 +ASSEMBLY_VERSION=2.14.0.0 +POLICY_VERSIONS="2.4 2.6 2.8 2.10 2.12" +GTK_REQUIRED_VERSION=2.13.5 +VERSIONCSDEFINES="-define:GTK_SHARP_2_6 -define:GTK_SHARP_2_8 -define:GTK_SHARP_2_10 -define:GTK_SHARP_2_12 -define:GTK_SHARP_2_14" +VERSIONCFLAGS="-DGTK_SHARP_2_6 -DGTK_SHARP_2_8 -DGTK_SHARP_2_10 -DGTK_SHARP_2_12 -DGTK_SHARP_2_14" +GTK_API_TAG=2.14 + +. ./bootstrap-generic "$@" diff --git a/configure.in.in b/configure.in.in index b8ba2b261..990cce0e3 100644 --- a/configure.in.in +++ b/configure.in.in @@ -174,6 +174,10 @@ PKG_CHECK_MODULES(GLIB, gobject-2.0 >= $GTK_REQUIRED_VERSION) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) +PKG_CHECK_MODULES(GIO, gio-2.0 >= $GTK_REQUIRED_VERSION) +AC_SUBST(GIO_CFLAGS) +AC_SUBST(GIO_LIBS) + PKG_CHECK_MODULES(PANGO, pango) AC_SUBST(PANGO_CFLAGS) AC_SUBST(PANGO_LIBS) @@ -228,6 +232,10 @@ glib/Makefile glib/glib-sharp-2.0.pc glib/glib-sharp.dll.config glib/glue/Makefile +gio/Makefile +gio/gio-sharp-2.0.pc +gio/gio-sharp.dll.config +gio/glue/Makefile cairo/Makefile pango/Makefile pango/pango-sharp.dll.config diff --git a/gdk/Colormap.custom b/gdk/Colormap.custom new file mode 100644 index 000000000..5029db880 --- /dev/null +++ b/gdk/Colormap.custom @@ -0,0 +1,30 @@ +// Gdk.Colormap.custom - Colormap customizations +// +// Copyright (c) 2009 Novell, Inc. +// +// This code is inserted after the automatically generated code. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + + + public int AllocColors (Gdk.Color[] colors, int n_colors, bool writeable, bool best_match, bool[] success) + { + return gdk_colormap_alloc_colors (Handle, colors, n_colors, writeable, best_match, success); + } + + public void FreeColors (Gdk.Color[] colors, int n_colors) + { + gdk_colormap_free_colors (Handle, colors, n_colors); + } diff --git a/gdk/Gdk.metadata b/gdk/Gdk.metadata index 45598b7ec..87316e600 100644 --- a/gdk/Gdk.metadata +++ b/gdk/Gdk.metadata @@ -64,7 +64,7 @@ 1 1 ref - 1 + 1 public public public @@ -92,7 +92,6 @@ 1 1 1 - n_points 1 out gpointer @@ -197,7 +196,6 @@ out 1 1 - n_points call 1 false diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 43175cbc0..7bc0a5afe 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -8,9 +8,9 @@ endif pkg = gdk SYMBOLS = gdk-symbols.xml -INCLUDE_API = $(srcdir)/../glib/glib-api.xml ../pango/pango-api.xml +INCLUDE_API = $(srcdir)/../glib/glib-api.xml $(top_builddir)/gio/gio-api.xml $(top_builddir)/pango/pango-api.xml METADATA = Gdk.metadata -references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll $(local_mono_cairo) +references = $(top_builddir)/glib/glib-sharp.dll $(top_builddir)/gio/gio-sharp.dll $(top_builddir)/pango/pango-sharp.dll $(local_mono_cairo) glue_includes = gdk/gdk.h sources = \ @@ -40,6 +40,7 @@ sources = \ customs = \ Atom.custom \ Color.custom \ + Colormap.custom \ Device.custom \ DeviceAxis.custom \ Display.custom \ diff --git a/gdk/gdk-api-2.12.raw b/gdk/gdk-api-2.14.raw similarity index 95% rename from gdk/gdk-api-2.12.raw rename to gdk/gdk-api-2.14.raw index ebb582d22..4a54eb0c0 100644 --- a/gdk/gdk-api-2.12.raw +++ b/gdk/gdk-api-2.14.raw @@ -31,6 +31,9 @@ + + + @@ -192,6 +195,7 @@ + @@ -514,6 +518,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -531,7 +578,7 @@ - + @@ -546,8 +593,8 @@ - - + + @@ -812,7 +859,7 @@ - + @@ -844,7 +891,7 @@ - + @@ -882,7 +929,7 @@ - + @@ -1236,7 +1283,7 @@ - + @@ -1252,7 +1299,7 @@ - + @@ -1278,7 +1325,7 @@ - + @@ -1337,15 +1384,15 @@ - - + + - + @@ -1369,8 +1416,8 @@ - - + + @@ -1378,8 +1425,8 @@ - - + + @@ -1402,7 +1449,7 @@ - + @@ -1415,7 +1462,7 @@ - + @@ -1430,7 +1477,7 @@ - + @@ -1443,7 +1490,7 @@ - + @@ -1453,8 +1500,8 @@ - - + + @@ -1493,7 +1540,7 @@ - + @@ -1671,13 +1718,13 @@ - + - + @@ -1848,13 +1895,13 @@ - + - + @@ -2065,13 +2112,19 @@ - + - + + + + + + + @@ -2124,6 +2177,24 @@ + + + + + + + + + + + + + + + + + + @@ -2299,13 +2370,13 @@ - + - + @@ -2512,7 +2583,7 @@ - + @@ -2520,7 +2591,7 @@ - + @@ -2528,14 +2599,14 @@ - + - + @@ -2580,7 +2651,7 @@ - + @@ -2626,6 +2697,9 @@ + + + @@ -2718,7 +2792,7 @@ - + @@ -2861,7 +2935,7 @@ - + @@ -3399,14 +3473,14 @@ - + - + @@ -3428,7 +3502,7 @@ - + @@ -3447,7 +3521,7 @@ - + @@ -3468,21 +3542,21 @@ - - + + - + - + @@ -3495,7 +3569,7 @@ - + @@ -3505,25 +3579,25 @@ - + - + - + - + @@ -3620,10 +3694,26 @@ + + + + + + + + + + + + + + + + @@ -3842,28 +3932,28 @@ - + - + - + - + @@ -3990,17 +4080,17 @@ - + - + - + - + @@ -4062,7 +4152,7 @@ - + @@ -4077,7 +4167,7 @@ - + @@ -4085,7 +4175,7 @@ - + @@ -4099,7 +4189,7 @@ - + @@ -4107,20 +4197,20 @@ - + - + - + @@ -4146,13 +4236,13 @@ - + - + @@ -4216,7 +4306,7 @@ - + @@ -4344,7 +4434,7 @@ - + @@ -4354,7 +4444,7 @@ - + @@ -4658,7 +4748,7 @@ - + @@ -4669,7 +4759,7 @@ - + @@ -4855,6 +4945,24 @@ + + + + + + + + + + + + + + + + + + @@ -5147,6 +5255,23 @@ + + + + + + + + + + + + + + + + + @@ -5229,6 +5354,16 @@ + + + + + + + + + + @@ -5379,7 +5514,7 @@ - + @@ -5387,13 +5522,13 @@ - + - + diff --git a/generator/BoxedGen.cs b/generator/BoxedGen.cs index c3eb408fc..5ad6d8749 100644 --- a/generator/BoxedGen.cs +++ b/generator/BoxedGen.cs @@ -32,6 +32,7 @@ namespace GtkSharp.Generation { public override void Generate (GenerationInfo gen_info) { Method copy = methods["Copy"] as Method; + Method free = methods["Free"] as Method; methods.Remove ("Copy"); methods.Remove ("Free"); @@ -62,6 +63,14 @@ namespace GtkSharp.Generation { sw.WriteLine ("\t\t}"); } + if (free != null && free.IsDeprecated) { + sw.WriteLine (); + sw.WriteLine ("\t\t[Obsolete(\"This is a no-op\")]"); + sw.WriteLine ("\t\tpublic " + QualifiedName + " Free () {"); + sw.WriteLine ("\t\t\treturn this;"); + sw.WriteLine ("\t\t}"); + } + sw.WriteLine ("#endregion"); AppendCustom(sw, gen_info.CustomDir); sw.WriteLine ("\t}"); diff --git a/generator/PropertyBase.cs b/generator/PropertyBase.cs index d031bd8dc..ef106f6bc 100644 --- a/generator/PropertyBase.cs +++ b/generator/PropertyBase.cs @@ -62,7 +62,11 @@ namespace GtkSharp.Generation { protected string cstype; public string CSType { get { - if (cstype == null) + if (Getter != null) + return Getter.Signature.IsAccessor ? Getter.Signature.AccessorType : Getter.ReturnType; + else if (Setter != null) + return Setter.Signature.Types; + else if (cstype == null) cstype = SymbolTable.Table.GetCSType (CType); return cstype; } @@ -80,33 +84,23 @@ namespace GtkSharp.Generation { } } - Method getter; protected Method Getter { get { - if (getter == null) { - getter = container_type.GetMethod ("Get" + Name); - if (getter != null && getter.Name == "Get" + Name && - getter.IsGetter) - cstype = getter.ReturnType; - else - getter = null; - } - return getter; + Method getter = container_type.GetMethod ("Get" + Name); + if (getter != null && getter.Name == "Get" + Name && getter.IsGetter) + return getter; + else + return null; } } - Method setter; protected Method Setter { get { - if (setter == null) { - setter = container_type.GetMethod ("Set" + Name); - if (setter != null && setter.Name == "Set" + Name && - setter.IsSetter) - cstype = setter.Signature.Types; - else - setter = null; - } - return setter; + Method setter = container_type.GetMethod ("Set" + Name); + if (setter != null && setter.Name == "Set" + Name && setter.IsSetter && (Getter == null || setter.Signature.Types == CSType)) + return setter; + else + return null; } } diff --git a/gio/File.custom b/gio/File.custom new file mode 100644 index 000000000..f764de790 --- /dev/null +++ b/gio/File.custom @@ -0,0 +1,31 @@ +// File.custom - customizations to GLib.File +// +// Authors: Stephane Delcroix +// +// Copyright (c) 2008 Novell, Inc. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + +bool Exists +{ + get; +} + +System.Uri Uri +{ + get; +} + +bool Delete(); diff --git a/gio/FileAdapter.custom b/gio/FileAdapter.custom new file mode 100644 index 000000000..24033678e --- /dev/null +++ b/gio/FileAdapter.custom @@ -0,0 +1,46 @@ +// FileAdapter.custom - customizations to GLib.FileAdapter +// +// Authors: Stephane Delcroix +// +// Copyright (c) 2008 Novell, Inc. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + +public override string ToString () +{ + return Uri.ToString (); +} + +public bool Exists { + get { return QueryExists (null); } +} + +public bool Delete () +{ + return Delete (null); +} + +[DllImport("gio")] +static extern IntPtr g_file_get_uri(IntPtr raw); + +public System.Uri Uri { + get { + IntPtr raw_ret = g_file_get_uri(Handle); + string ret = GLib.Marshaller.PtrToStringGFree(raw_ret); + return new System.Uri (ret); + } +} + + diff --git a/gio/FileEnumerator.custom b/gio/FileEnumerator.custom new file mode 100644 index 000000000..acd483295 --- /dev/null +++ b/gio/FileEnumerator.custom @@ -0,0 +1,59 @@ +// FileEnumerator.custom - customizations to GLib.FileEnumerator +// +// Authors: Stephane Delcroix +// +// Copyright (c) 2008 Novell, Inc. +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + +public IEnumerator GetEnumerator () +{ + return new Enumerator (this); +} + +public FileInfo NextFile () +{ + return NextFile ((Cancellable) null); +} + +class Enumerator : IEnumerator +{ + FileEnumerator file_enumerator; + + public Enumerator (FileEnumerator file_enumerator) + { + this.file_enumerator = file_enumerator; + } + + FileInfo current=null; + public object Current { + get { + return current; + } + } + + public bool MoveNext () + { + current = file_enumerator.NextFile (); + if (current == null) + return false; + return true; + } + + public void Reset () + { + throw new NotImplementedException (); + } +} diff --git a/gio/FileFactory.cs b/gio/FileFactory.cs new file mode 100644 index 000000000..0a5b0faa3 --- /dev/null +++ b/gio/FileFactory.cs @@ -0,0 +1,59 @@ +// +// FileFactory.cs +// +// Author(s): +// Stephane Delcroix +// +// Copyright (c) 2008 Stephane Delcroix +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of version 2 of the Lesser GNU General +// Public License as published by the Free Software Foundation. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the +// Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + +using System; +using System.Runtime.InteropServices; + +namespace GLib +{ + public class FileFactory + { + [DllImport ("libgio-2.0-0.dll")] + private static extern IntPtr g_file_new_for_uri (string uri); + + public static File NewForUri (string uri) + { + return GLib.FileAdapter.GetObject (g_file_new_for_uri (uri), false) as File; + } + + public static File NewForUri (Uri uri) + { + return GLib.FileAdapter.GetObject (g_file_new_for_uri (uri.ToString ()), false) as File; + } + + [DllImport ("libgio-2.0-0.dll")] + private static extern IntPtr g_file_new_for_path (string path); + + public static File NewForPath (string path) + { + return GLib.FileAdapter.GetObject (g_file_new_for_path (path), false) as File; + } + + [DllImport ("libgio-2.0-0.dll")] + private static extern IntPtr g_file_new_for_commandline_args (string args); + + public static File NewForCommandlineArgs (string args) + { + return GLib.FileAdapter.GetObject (g_file_new_for_commandline_args (args), false) as File; + } + } +} diff --git a/gio/Gio.metadata b/gio/Gio.metadata new file mode 100644 index 000000000..4d39de7dc --- /dev/null +++ b/gio/Gio.metadata @@ -0,0 +1,45 @@ + + + + GLib + GetParsedName + async + GetMountInstance + async + + guchar* + 1 + guchar* + 1 + guchar* + 1 + guchar* + 1 + guchar* + 1 + guchar* + 1 + 1 + EmitReply + 1 + 1 + 1 + GAppInfo* + true + + GAppInfo* + true + true + 1 + GetCanSeek + GetPosition + GetAttributeLong + SetAttributeLong + GetAttributeULong + SetAttributeULong + GetAttributeInt + SetAttributeInt + GetAttributeUInt + SetAttributeUInt + 1 + diff --git a/gio/GioStream.cs b/gio/GioStream.cs new file mode 100644 index 000000000..03d1696f1 --- /dev/null +++ b/gio/GioStream.cs @@ -0,0 +1,215 @@ +/* + * GioStream.cs: provide a System.IO.Stream api to [Input|Output]Streams + * + * Author(s): + * Stephane Delcroix (stephane@delcroix.org) + * + * Copyright (c) 2008 Novell, Inc. + * + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ +using System; + +namespace GLib +{ + public class GioStream : System.IO.Stream + { + object stream; + bool can_read; + bool can_seek; + bool can_write; + bool is_disposed; + + public GioStream (Uri uri, System.IO.FileMode mode) + { + throw new NotImplementedException (); + } + + public GioStream (string filename, System.IO.FileMode mode) + { + throw new NotImplementedException (); + } + + public GioStream (InputStream stream) + { + this.stream = stream; + can_read = true; + can_seek = stream is Seekable && (stream as Seekable).CanSeek; + } + + public GioStream (OutputStream stream) + { + this.stream = stream; + can_write = true; + can_seek = stream is Seekable && (stream as Seekable).CanSeek; + } + + public override bool CanSeek { + get { return can_seek; } + } + + public override bool CanRead { + get { return can_read; } + } + + public override bool CanWrite { + get { return can_write; } + } + + public override long Length { + get { + if (!CanSeek) + throw new NotSupportedException ("This stream doesn't support seeking"); + if (is_disposed) + throw new ObjectDisposedException ("The stream is closed"); + + if (stream is FileInputStream) { + FileInfo info = (stream as FileInputStream).QueryInfo ("standard::size", null); + return info.Size; + } + if (stream is FileOutputStream) { + FileInfo info = (stream as FileOutputStream).QueryInfo ("standard::size", null); + return info.Size; + } + throw new NotImplementedException (String.Format ("not implemented for {0} streams", stream.GetType())); + } + } + + public override long Position { + get { + if (!CanSeek) + throw new NotSupportedException ("This stream doesn't support seeking"); + if (is_disposed) + throw new ObjectDisposedException ("The stream is closed"); + return (stream as Seekable).Position; + } + set { + Seek (value, System.IO.SeekOrigin.Begin); + } + } + + public override void Flush () + { + if (is_disposed) + throw new ObjectDisposedException ("The stream is closed"); + } + + public override int Read (byte[] buffer, int offset, int count) + { + if (buffer == null) + throw new ArgumentNullException ("buffer"); + if (offset + count - 1 > buffer.Length) + throw new ArgumentException ("(offset + count - 1) is greater than the length of buffer"); + if (offset < 0) + throw new ArgumentOutOfRangeException ("offset"); + if (count < 0) + throw new ArgumentOutOfRangeException ("count"); + if (!CanRead) + throw new NotSupportedException ("The stream does not support reading"); + if (is_disposed) + throw new ObjectDisposedException ("The stream is closed"); + InputStream input_stream = stream as InputStream; + if (input_stream == null) + throw new System.Exception ("this shouldn't happen"); + + if (offset == 0) + return (int)input_stream.Read (buffer, (ulong)count, null); + else { + byte[] buf = new byte[count]; + int ret = (int)input_stream.Read (buf, (ulong)count, null); + buf.CopyTo (buffer, offset); + return ret; + } + } + + public override void Write (byte[] buffer, int offset, int count) + { + if (buffer == null) + throw new ArgumentNullException ("buffer"); + if (offset + count > buffer.Length) + throw new ArgumentException ("(offset + count) is greater than the length of buffer"); + if (offset < 0) + throw new ArgumentOutOfRangeException ("offset"); + if (count < 0) + throw new ArgumentOutOfRangeException ("count"); + if (!CanWrite) + throw new NotSupportedException ("The stream does not support writing"); + if (is_disposed) + throw new ObjectDisposedException ("The stream is closed"); + OutputStream output_stream = stream as OutputStream; + if (output_stream == null) + throw new System.Exception ("this shouldn't happen"); + if (offset == 0) { + output_stream.Write (buffer, (ulong)count, null); + return; + } else { + byte[] buf = new byte[count]; + Array.Copy (buffer, offset, buf, 0, count); + output_stream.Write (buf, (ulong)count, null); + return; + } + } + + public override long Seek (long offset, System.IO.SeekOrigin origin) + { + if (!CanSeek) + throw new NotSupportedException ("This stream doesn't support seeking"); + if (is_disposed) + throw new ObjectDisposedException ("The stream is closed"); + Seekable seekable = stream as Seekable; + + SeekType seek_type; + switch (origin) { + case System.IO.SeekOrigin.Current: + seek_type = SeekType.Cur; + break; + case System.IO.SeekOrigin.End: + seek_type = SeekType.End; + break; + case System.IO.SeekOrigin.Begin: + default: + seek_type = SeekType.Set; + break; + } + seekable.Seek (offset, seek_type, null); + return Position; + } + + public override void SetLength (long value) + { + if (!CanSeek || !CanWrite) + throw new NotSupportedException ("This stream doesn't support seeking"); + if (is_disposed) + throw new ObjectDisposedException ("The stream is closed"); + throw new NotImplementedException (); + } + + public override void Close () + { + if (stream is InputStream) + (stream as InputStream).Close (null); + if (stream is OutputStream) + (stream as OutputStream).Close (null); + is_disposed = true; + } + } +} diff --git a/gio/Makefile.am b/gio/Makefile.am new file mode 100644 index 000000000..94b951450 --- /dev/null +++ b/gio/Makefile.am @@ -0,0 +1,25 @@ +SUBDIRS = . glue + +pkg = gio +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gio-sharp-2.0.pc +METADATA = Gio.metadata +SYMBOLS = +references = ../glib/glib-sharp.dll +glue_includes = gio/gio.h + +POLICY_VERSIONS= + +sources = \ + FileFactory.cs \ + GioStream.cs + +customs = \ + File.custom \ + FileAdapter.custom \ + FileEnumerator.custom + +add_dist = gio-sharp-2.0.pc.in + +include ../Makefile.include + diff --git a/gio/gio-api.raw b/gio/gio-api.raw new file mode 100644 index 000000000..e2c4e01d8 --- /dev/null +++ b/gio/gio-api.raw @@ -0,0 +1,5078 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gio/gio-sharp-2.0.pc.in b/gio/gio-sharp-2.0.pc.in new file mode 100644 index 000000000..00cd7335f --- /dev/null +++ b/gio/gio-sharp-2.0.pc.in @@ -0,0 +1,13 @@ +prefix=${pcfiledir}/../.. +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +assemblies_dir=${libdir}/mono/@PACKAGE_VERSION@ +gapidir=${prefix}/share/gapi-2.0 + +Name: GIO# +Description: GIO# - GIO .NET Binding +Version: @VERSION@ +Cflags: -I:${gapidir}/gio-api.xml +Libs: -r:${assemblies_dir}/gio-sharp.dll +Requires: glib-sharp-2.0 + diff --git a/gio/gio-sharp.dll.config.in b/gio/gio-sharp.dll.config.in new file mode 100644 index 000000000..6dc0e6865 --- /dev/null +++ b/gio/gio-sharp.dll.config.in @@ -0,0 +1,6 @@ + + + + + + diff --git a/gio/glue/Makefile.am b/gio/glue/Makefile.am new file mode 100644 index 000000000..da60af725 --- /dev/null +++ b/gio/glue/Makefile.am @@ -0,0 +1,18 @@ +lib_LTLIBRARIES = libgiosharpglue-2.la + +libgiosharpglue_2_la_SOURCES = + +nodist_libgiosharpglue_2_la_SOURCES = generated.c + +libgiosharpglue_2_la_LDFLAGS = -module -avoid-version -no-undefined + +libgiosharpglue_2_la_LIBADD = $(GIO_LIBS) + +INCLUDES = $(GIO_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir) + +libgiosharpglue.dll: $(libgiosharpglue_2_la_OBJECTS) libgiosharpglue.rc libgiosharpglue.def + ./build-dll libgiosharpglue-2 $(VERSION) + +CLEANFILES = lib*.a lib*.dll + +EXTRA_DIST = win32dll.c diff --git a/gio/glue/win32dll.c b/gio/glue/win32dll.c new file mode 100755 index 000000000..a57c07683 --- /dev/null +++ b/gio/glue/win32dll.c @@ -0,0 +1,16 @@ +#define WIN32_LEAN_AND_MEAN +#include +#undef WIN32_LEAN_AND_MEAN +#include + +BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) +{ + return TRUE; +} + +/* +BOOL APIENTRY DllMainCRTStartup (HINSTANCE hInst, DWORD reason, LPVOID reserved) +{ + return TRUE; +} +*/ diff --git a/glade/glade-api-2.12.raw b/glade/glade-api-2.14.raw similarity index 100% rename from glade/glade-api-2.12.raw rename to glade/glade-api-2.14.raw diff --git a/gtk/ColorSelectionDialog.custom b/gtk/ColorSelectionDialog.custom index 7fbd76564..76450ca4d 100644 --- a/gtk/ColorSelectionDialog.custom +++ b/gtk/ColorSelectionDialog.custom @@ -35,27 +35,3 @@ public class ColorSelectionButton : Gtk.Button { } } -[DllImport("gtksharpglue-2")] -static extern IntPtr gtksharp_color_selection_dialog_get_colorsel (IntPtr i); -public ColorSelection ColorSelection { - get { return GLib.Object.GetObject (gtksharp_color_selection_dialog_get_colorsel (this.Handle), false) as ColorSelection; } -} - -[DllImport("gtksharpglue-2")] -static extern IntPtr gtksharp_color_selection_dialog_get_ok_button (IntPtr i); -public Button OkButton { - get { return GLib.Object.GetObject (gtksharp_color_selection_dialog_get_ok_button (this.Handle), false) as Button; } -} - -[DllImport("gtksharpglue-2")] -static extern IntPtr gtksharp_color_selection_dialog_get_cancel_button (IntPtr i); -public Button CancelButton { - get { return GLib.Object.GetObject (gtksharp_color_selection_dialog_get_cancel_button (this.Handle), false) as Button; } -} - -[DllImport("gtksharpglue-2")] -static extern IntPtr gtksharp_color_selection_dialog_get_help_button (IntPtr i); -public Button HelpButton { - get { return GLib.Object.GetObject (gtksharp_color_selection_dialog_get_help_button (this.Handle), false) as Button; } -} - diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata index a82298298..e17d4a222 100644 --- a/gtk/Gtk.metadata +++ b/gtk/Gtk.metadata @@ -31,6 +31,7 @@ public public 1 + 1 1 1 1 @@ -299,6 +300,11 @@ 1 1 1 + GtkColorSelection* + GtkButton* + GtkButton* + GtkColorSelection* + GtkButton* GtkButton* public GtkEntry* @@ -306,6 +312,8 @@ out GetTearoffTitle SetTearoffTitle + PoppedDown + PoppedUp public 1 @@ -332,6 +340,7 @@ VBox GtkVBox* 1 + GtkHButtonBox* Respond GtkResponseType GtkResponseType @@ -384,9 +393,14 @@ public GtkButton* public + GtkButton* + GtkButton* + GtkButton* 1 1 + 1 1 + IsChildDetached 1 1 @@ -489,6 +503,7 @@ Deactivated 1 1 + GetIsShowing 1 void void @@ -506,6 +521,7 @@ 1 1 IsEmbedded + GetIsEmbedded 1 GetAcceptsPdf GetAcceptsPs @@ -553,6 +569,7 @@ 1 1 1 + PoppedUp private private GetHScrollbar @@ -669,6 +686,7 @@ 1 1 1 + EmitToolbarReconfigured TooltipSet 1 virtual-root @@ -761,6 +779,7 @@ 1 1 ProcessEvent + 1 out 1 1 @@ -796,8 +815,10 @@ Focused FocusGrabbed Hidden + 1 Mapped MnemonicActivated + direction Realized HelpShown Shown diff --git a/gtk/Makefile.am b/gtk/Makefile.am index ac4effc02..6628640c1 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -11,9 +11,9 @@ pkgconfigdir=$(libdir)/pkgconfig pkgconfig_DATA=gtk-sharp-2.0.pc SYMBOLS = gtk-symbols.xml -INCLUDE_API = $(srcdir)/../glib/glib-api.xml ../pango/pango-api.xml ../atk/atk-api.xml ../gdk/gdk-api.xml +INCLUDE_API = $(srcdir)/../glib/glib-api.xml $(top_builddir)/gio/gio-api.xml $(top_builddir)/pango/pango-api.xml $(top_builddir)/atk/atk-api.xml $(top_builddir)/gdk/gdk-api.xml METADATA = Gtk.metadata -references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll $(local_mono_cairo) +references = $(top_builddir)/glib/glib-sharp.dll $(top_builddir)/gio/gio-sharp.dll $(top_builddir)/pango/pango-sharp.dll $(top_builddir)/atk/atk-sharp.dll $(top_builddir)/gdk/gdk-sharp.dll $(local_mono_cairo) glue_includes = gtk/gtk.h sources = \ @@ -23,7 +23,6 @@ sources = \ ChildPropertyAttribute.cs \ ITreeNode.cs \ Key.cs \ - MoveFocusHandler.cs \ NodeCellDataFunc.cs \ NodeSelection.cs \ NodeStore.cs \ diff --git a/gtk/Menu.custom b/gtk/Menu.custom index eddc6a183..4b607a3ee 100644 --- a/gtk/Menu.custom +++ b/gtk/Menu.custom @@ -42,3 +42,11 @@ } } + [DllImport("libgtk-win32-2.0-0.dll")] + static extern void gtk_menu_set_active (IntPtr raw, uint index_); + + public void SetActive (uint index_) + { + gtk_menu_set_active (Handle, index_); + } + diff --git a/gtk/MoveFocusHandler.cs b/gtk/MoveFocusHandler.cs deleted file mode 100644 index ea877b99b..000000000 --- a/gtk/MoveFocusHandler.cs +++ /dev/null @@ -1,20 +0,0 @@ -// This file was generated by the Gtk# code generator. -// Any changes made will be lost if regenerated. - -namespace Gtk { - - using System; - - [Obsolete ("Events using this type were replaced by Gtk.Widget keybinding signal")] - public delegate void MoveFocusHandler(object o, MoveFocusArgs args); - - [Obsolete ("Events using this type were replaced by Gtk.Widget keybinding signal")] - public class MoveFocusArgs : GLib.SignalArgs { - public Gtk.DirectionType Direction{ - get { - return (Gtk.DirectionType) Args[0]; - } - } - - } -} diff --git a/gtk/TreeModelSort.custom b/gtk/TreeModelSort.custom index 8e4331cf2..c34b3dba2 100644 --- a/gtk/TreeModelSort.custom +++ b/gtk/TreeModelSort.custom @@ -43,6 +43,16 @@ return ret; } + + public TreeIter ConvertChildIterToIter (TreeIter iter) + { + TreeIter result; + if (ConvertChildIterToIter (out result, iter)) + return result; + else + return TreeIter.Zero; + } + public void SetValue (Gtk.TreeIter iter, int column, bool value) { throw new NotImplementedException (); } diff --git a/gtk/glue/Makefile.am b/gtk/glue/Makefile.am index 81a8964a8..7f4f0e6b8 100644 --- a/gtk/glue/Makefile.am +++ b/gtk/glue/Makefile.am @@ -4,7 +4,6 @@ libgtksharpglue_2_la_SOURCES = \ adjustment.c \ cellrenderer.c \ clipboard.c \ - colorseldialog.c \ container.c \ nodestore.c \ object.c \ diff --git a/gtk/glue/colorseldialog.c b/gtk/glue/colorseldialog.c deleted file mode 100644 index e02cdca00..000000000 --- a/gtk/glue/colorseldialog.c +++ /dev/null @@ -1,56 +0,0 @@ -/* colorseldialog.c : Glue for accessing fields in the GtkColorSelectionDialog widget. - * - * Author: Duncan Mak (duncan@ximian.com) - * - * Copyright (c) Ximian, INc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the Lesser GNU General - * Public License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include - -/* Forward declarations */ -GtkWidget *gtksharp_color_selection_dialog_get_colorsel (GtkColorSelectionDialog *dialog); - -GtkWidget *gtksharp_color_selection_dialog_get_ok_button (GtkColorSelectionDialog *dialog); - -GtkWidget *gtksharp_color_selection_dialog_get_cancel_button (GtkColorSelectionDialog *dialog); - -GtkWidget *gtksharp_color_selection_dialog_get_help_button (GtkColorSelectionDialog *dialog); -/* */ - -GtkWidget* -gtksharp_color_selection_dialog_get_colorsel (GtkColorSelectionDialog *dialog) -{ - return dialog->colorsel; -} - -GtkWidget* -gtksharp_color_selection_dialog_get_ok_button (GtkColorSelectionDialog *dialog) -{ - return dialog->ok_button; -} - -GtkWidget* -gtksharp_color_selection_dialog_get_cancel_button (GtkColorSelectionDialog *dialog) -{ - return dialog->cancel_button; -} - -GtkWidget* -gtksharp_color_selection_dialog_get_help_button (GtkColorSelectionDialog *dialog) -{ - return dialog->help_button; -} diff --git a/gtk/gtk-api-2.12.raw b/gtk/gtk-api-2.14.raw similarity index 95% rename from gtk/gtk-api-2.12.raw rename to gtk/gtk-api-2.14.raw index 42680184b..cfd8fdd18 100644 --- a/gtk/gtk-api-2.12.raw +++ b/gtk/gtk-api-2.14.raw @@ -65,6 +65,7 @@ + @@ -88,6 +89,7 @@ + @@ -210,6 +212,7 @@ + @@ -241,6 +244,7 @@ + @@ -290,6 +294,16 @@ + + + + + + + + + + @@ -359,6 +373,7 @@ + @@ -852,6 +867,16 @@ + + + + + + + + + + @@ -937,6 +962,14 @@ + + + + + + + + @@ -1472,13 +1505,13 @@ - + - + @@ -1632,7 +1665,7 @@ - + @@ -1641,7 +1674,7 @@ - + @@ -1784,12 +1817,12 @@ - + - + @@ -1801,19 +1834,19 @@ - + - + - + - + @@ -1828,14 +1861,14 @@ - + - - + + @@ -1870,7 +1903,7 @@ - + @@ -1878,7 +1911,7 @@ - + @@ -1958,6 +1991,9 @@ + + + @@ -1967,18 +2003,27 @@ + + + + + + + + + @@ -2041,6 +2086,13 @@ + + + + + + + @@ -2065,6 +2117,13 @@ + + + + + + + @@ -2089,6 +2148,13 @@ + + + + + + + @@ -2146,6 +2212,12 @@ + + + + + + @@ -2480,6 +2552,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2562,7 +2684,7 @@ - + @@ -2570,7 +2692,7 @@ - + @@ -2578,7 +2700,7 @@ - + @@ -2586,14 +2708,14 @@ - + - + @@ -2870,7 +2992,7 @@ - + @@ -2899,7 +3021,7 @@ - + @@ -2908,7 +3030,7 @@ - + @@ -2935,7 +3057,7 @@ - + @@ -2951,7 +3073,7 @@ - + @@ -3136,7 +3258,9 @@ - + + + @@ -3145,7 +3269,7 @@ - + @@ -3205,6 +3329,12 @@ + + + + + + @@ -3559,7 +3689,7 @@ - + @@ -3567,7 +3697,7 @@ - + @@ -3575,14 +3705,14 @@ - + - + @@ -3703,7 +3833,7 @@ - + @@ -3744,7 +3874,7 @@ - + @@ -3760,9 +3890,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3776,6 +3932,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4098,7 +4284,7 @@ - + @@ -4113,7 +4299,7 @@ - + @@ -4184,6 +4370,23 @@ + + + + + + + + + + + + + + + + + @@ -4533,43 +4736,46 @@ - + + + + - + - + - + - + - + - + @@ -4595,6 +4801,12 @@ + + + + + + @@ -4621,6 +4833,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -4726,14 +4958,15 @@ + - - + + @@ -4751,7 +4984,7 @@ - + @@ -4766,9 +4999,9 @@ - - - + + + @@ -4785,8 +5018,8 @@ - - + + @@ -4839,6 +5072,14 @@ + + + + + + + + @@ -4856,6 +5097,7 @@ + @@ -5145,7 +5387,7 @@ - + @@ -5214,6 +5456,13 @@ + + + + + + + @@ -5284,6 +5533,9 @@ + + + @@ -5302,6 +5554,9 @@ + + + @@ -5309,7 +5564,7 @@ - + @@ -5370,7 +5625,7 @@ - + @@ -5494,9 +5749,16 @@ + + + + + + + @@ -5586,6 +5848,25 @@ + + + + + + + + + + + + + + + + + + + @@ -5596,6 +5877,7 @@ + @@ -5622,6 +5904,9 @@ + + + @@ -5699,6 +5984,12 @@ + + + + + + @@ -5722,7 +6013,7 @@ - + @@ -5795,7 +6086,7 @@ - + @@ -5963,7 +6254,7 @@ - + @@ -5978,6 +6269,9 @@ + + + @@ -6072,7 +6366,7 @@ - + @@ -6163,6 +6457,12 @@ + + + + + + @@ -6248,7 +6548,7 @@ - + @@ -6299,7 +6599,9 @@ - + + + @@ -6312,7 +6614,7 @@ - + @@ -6321,14 +6623,14 @@ - + - + @@ -6342,30 +6644,40 @@ - + - + - + - + + + + + + + + + + + @@ -6410,9 +6722,15 @@ + + + + + + @@ -6501,6 +6819,12 @@ + + + + + + @@ -6534,14 +6858,14 @@ - + - + @@ -6549,7 +6873,7 @@ - + @@ -6557,7 +6881,7 @@ - + @@ -6837,7 +7161,7 @@ - + @@ -6885,7 +7209,7 @@ - + @@ -6910,7 +7234,7 @@ - + @@ -7163,15 +7487,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -7201,12 +7549,21 @@ + + + + + + + + + @@ -7334,20 +7691,24 @@ - + + - + + + + @@ -7526,6 +7887,9 @@ + + + @@ -7641,6 +8005,14 @@ + + + + + + + + @@ -7695,7 +8067,7 @@ - + @@ -7703,7 +8075,7 @@ - + @@ -7716,37 +8088,37 @@ - + - + - + - + - + - + @@ -8077,6 +8449,7 @@ + @@ -8091,6 +8464,7 @@ + @@ -8105,6 +8479,13 @@ + + + + + + + @@ -8163,6 +8544,12 @@ + + + + + + @@ -8217,6 +8604,13 @@ + + + + + + + @@ -8299,19 +8693,19 @@ - + - + - + @@ -8324,13 +8718,13 @@ - + - + @@ -8459,7 +8853,7 @@ - + @@ -8500,7 +8894,7 @@ - + @@ -8522,14 +8916,14 @@ - + - + @@ -8610,7 +9004,7 @@ - + @@ -8754,7 +9148,7 @@ - + @@ -8766,7 +9160,7 @@ - + @@ -8790,7 +9184,7 @@ - + @@ -8799,13 +9193,13 @@ - + - + @@ -8830,6 +9224,9 @@ + + + @@ -9059,7 +9456,7 @@ - + @@ -9070,6 +9467,9 @@ + + + @@ -9134,6 +9534,7 @@ + @@ -9152,6 +9553,9 @@ + + + @@ -9177,6 +9581,12 @@ + + + + + + @@ -9190,7 +9600,7 @@ - + @@ -9375,8 +9785,20 @@ + + + + + + + + + + + + @@ -9404,6 +9826,9 @@ + + + @@ -9416,6 +9841,9 @@ + + + @@ -9538,33 +9966,38 @@ - + - + - + + + + + + @@ -9646,14 +10079,14 @@ - + - + @@ -9687,7 +10120,14 @@ - + + + + + + + + @@ -9832,6 +10272,9 @@ + + + @@ -9909,6 +10352,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9965,7 +10443,7 @@ - + @@ -9973,35 +10451,35 @@ - + - + - + - + - + @@ -10009,7 +10487,7 @@ - + @@ -10017,7 +10495,7 @@ - + @@ -10025,7 +10503,7 @@ - + @@ -10033,7 +10511,7 @@ - + @@ -10379,7 +10857,7 @@ - + @@ -10444,7 +10922,7 @@ - + @@ -10452,7 +10930,7 @@ - + @@ -10470,14 +10948,14 @@ - + - + @@ -10581,6 +11059,21 @@ + + + + + + + + + + + + + + + @@ -10717,40 +11210,40 @@ - + - + - + - + - + - + @@ -10818,6 +11311,7 @@ + @@ -10837,9 +11331,15 @@ + + + + + + @@ -10866,6 +11366,8 @@ + + @@ -10891,6 +11393,9 @@ + + + @@ -10915,12 +11420,18 @@ + + + + + + @@ -11335,6 +11846,9 @@ + + + @@ -11395,6 +11909,21 @@ + + + + + + + + + + + + + + + @@ -11493,6 +12022,12 @@ + + + + + + @@ -11990,20 +12525,20 @@ - + - + - + @@ -12017,7 +12552,7 @@ - + @@ -12547,7 +13082,7 @@ - + @@ -12616,6 +13151,7 @@ + @@ -12627,9 +13163,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -12657,6 +13217,12 @@ + + + + + + @@ -12686,7 +13252,7 @@ - + @@ -12694,7 +13260,7 @@ - + @@ -12936,13 +13502,13 @@ - + - + @@ -12957,6 +13523,9 @@ + + + @@ -13005,7 +13574,7 @@ - + @@ -13017,7 +13586,7 @@ - + @@ -13167,7 +13736,7 @@ - + @@ -13175,7 +13744,7 @@ - + @@ -13229,6 +13798,7 @@ + @@ -13242,7 +13812,7 @@ - + @@ -13250,7 +13820,7 @@ - + @@ -13268,6 +13838,9 @@ + + + @@ -13292,6 +13865,9 @@ + + + @@ -13301,6 +13877,11 @@ + + + + + @@ -13338,6 +13919,12 @@ + + + + + + @@ -13803,7 +14390,7 @@ - + @@ -14012,7 +14599,7 @@ - + @@ -14021,7 +14608,7 @@ - + @@ -14029,7 +14616,7 @@ - + @@ -14037,7 +14624,7 @@ - + @@ -14051,13 +14638,13 @@ - + - + @@ -14065,14 +14652,14 @@ - + - + @@ -14081,7 +14668,7 @@ - + @@ -14090,13 +14677,13 @@ - + - + @@ -14744,7 +15331,7 @@ - + @@ -14752,14 +15339,14 @@ - + - + @@ -14861,7 +15448,7 @@ - + @@ -14870,7 +15457,7 @@ - + @@ -14878,20 +15465,28 @@ - + + + + + + + + + - + - + @@ -14905,31 +15500,31 @@ - + - + - + - + - + @@ -14937,13 +15532,6 @@ - - - - - - - @@ -14951,6 +15539,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -15434,7 +16042,7 @@ - + @@ -15443,6 +16051,13 @@ + + + + + + + @@ -15451,6 +16066,9 @@ + + + @@ -15523,7 +16141,7 @@ - + @@ -15661,7 +16279,7 @@ - + @@ -15690,6 +16308,13 @@ + + + + + + + @@ -15712,7 +16337,7 @@ - + @@ -15857,19 +16482,19 @@ - + - + - + @@ -15987,6 +16612,9 @@ + + + @@ -16054,7 +16682,7 @@ - + @@ -16068,7 +16696,7 @@ - + @@ -16083,7 +16711,7 @@ - + @@ -16099,7 +16727,7 @@ - + @@ -16150,7 +16778,7 @@ - + @@ -16163,6 +16791,9 @@ + + + @@ -16237,7 +16868,7 @@ - + @@ -16274,7 +16905,7 @@ - + @@ -16472,7 +17103,7 @@ - + @@ -16480,7 +17111,7 @@ - + @@ -16532,7 +17163,7 @@ - + @@ -16540,32 +17171,32 @@ - + - + - + - + - + @@ -16574,13 +17205,13 @@ - + - + @@ -16955,7 +17586,7 @@ - + @@ -16980,7 +17611,7 @@ - + @@ -17073,7 +17704,7 @@ - + @@ -17105,7 +17736,7 @@ - + @@ -17256,7 +17887,7 @@ - + @@ -17397,7 +18028,7 @@ - + @@ -17495,20 +18126,20 @@ - + - + - + @@ -17516,7 +18147,7 @@ - + @@ -17524,14 +18155,14 @@ - + - + @@ -17693,7 +18324,7 @@ - + @@ -17820,6 +18451,7 @@ + @@ -17856,77 +18488,77 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -17939,6 +18571,13 @@ + + + + + + + @@ -17946,160 +18585,167 @@ - + - + - + - + - + - + - + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -18107,7 +18753,7 @@ - + @@ -18116,21 +18762,21 @@ - + - + - + @@ -18138,28 +18784,28 @@ - + - + - + - + @@ -18167,7 +18813,7 @@ - + @@ -18177,7 +18823,7 @@ - + @@ -18187,7 +18833,7 @@ - + @@ -18197,7 +18843,7 @@ - + @@ -18209,35 +18855,42 @@ - + - + - + - + - + + + + + + + + @@ -18254,33 +18907,33 @@ - + - + - + - + - + @@ -18418,7 +19071,7 @@ - + @@ -18537,6 +19190,12 @@ + + + + + + @@ -18558,6 +19217,9 @@ + + + @@ -18587,7 +19249,7 @@ - + @@ -18740,7 +19402,7 @@ - + @@ -19110,27 +19772,27 @@ - + - + - + - + @@ -19143,7 +19805,7 @@ - + @@ -19173,7 +19835,7 @@ - + @@ -19224,6 +19886,9 @@ + + + @@ -19380,7 +20045,7 @@ - + @@ -19669,6 +20334,9 @@ + + + @@ -19678,10 +20346,10 @@ - + - - + + @@ -19715,7 +20383,7 @@ - + @@ -19828,11 +20496,11 @@ - - - - - + + + + + @@ -19842,6 +20510,7 @@ + @@ -19915,6 +20584,12 @@ + + + + + + @@ -20064,6 +20739,11 @@ + + + + + @@ -20248,7 +20928,7 @@ - + @@ -20262,6 +20942,12 @@ + + + + + + @@ -20470,9 +21156,27 @@ + + + + + + + + + + + + + + + + + + @@ -21465,7 +22169,7 @@ - + @@ -21527,7 +22231,7 @@ - + @@ -21545,7 +22249,7 @@ - + @@ -21561,9 +22265,9 @@ - + - + @@ -21580,7 +22284,7 @@ - + @@ -21596,7 +22300,7 @@ - + @@ -21611,7 +22315,7 @@ - + @@ -21626,9 +22330,9 @@ - + - + @@ -21643,7 +22347,7 @@ - + @@ -21658,7 +22362,7 @@ - + @@ -21674,7 +22378,7 @@ - + @@ -21690,7 +22394,7 @@ - + @@ -21705,7 +22409,7 @@ - + @@ -21720,7 +22424,7 @@ - + @@ -21736,11 +22440,11 @@ - + - - + + @@ -21750,7 +22454,7 @@ - + @@ -21767,7 +22471,7 @@ - + @@ -21783,9 +22487,9 @@ - + - + @@ -21802,7 +22506,7 @@ - + @@ -21818,7 +22522,7 @@ - + @@ -21833,7 +22537,7 @@ - + @@ -21848,7 +22552,7 @@ - + @@ -21895,6 +22599,15 @@ + + + + + + + + + @@ -22368,8 +23081,8 @@ - - + + @@ -22599,7 +23312,7 @@ - + @@ -22679,7 +23392,7 @@ - + @@ -22773,7 +23486,7 @@ - + @@ -23013,7 +23726,7 @@ - + @@ -23134,7 +23847,7 @@ - + @@ -23202,7 +23915,7 @@ - + @@ -23231,7 +23944,7 @@ - + @@ -23354,10 +24067,15 @@ + + + + + diff --git a/pango/Pango.metadata b/pango/Pango.metadata index 8a03528c4..c295e8817 100644 --- a/pango/Pango.metadata +++ b/pango/Pango.metadata @@ -13,6 +13,8 @@ GetHash 1 1 + 1 + 1 1 1 1 @@ -83,7 +85,6 @@ 1 1 1 - 1 false private ref diff --git a/pango/pango-api-2.12.raw b/pango/pango-api-2.14.raw similarity index 92% rename from pango/pango-api-2.12.raw rename to pango/pango-api-2.14.raw index 5405b5280..3e83701b8 100644 --- a/pango/pango-api-2.12.raw +++ b/pango/pango-api-2.14.raw @@ -37,6 +37,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -154,6 +175,17 @@ + + + + + + + + + + + @@ -245,7 +277,7 @@ - + @@ -266,6 +298,9 @@ + + + @@ -328,6 +363,7 @@ + @@ -346,6 +382,12 @@ + + + + + + @@ -474,6 +516,9 @@ + + + @@ -501,7 +546,7 @@ - + @@ -546,6 +591,9 @@ + + + @@ -570,6 +618,9 @@ + + + @@ -720,6 +771,12 @@ + + + + + + @@ -890,6 +947,16 @@ + + + + + + + + + + @@ -914,6 +981,15 @@ + + + + + + + + + @@ -967,6 +1043,12 @@ + + + + + + @@ -1199,6 +1281,12 @@ + + + + + + @@ -1460,7 +1548,7 @@ - + @@ -1470,9 +1558,15 @@ + + + + + + @@ -1488,7 +1582,46 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1603,6 +1736,12 @@ + + + + + + @@ -1618,11 +1757,17 @@ + + + + + + @@ -1645,6 +1790,9 @@ + + + @@ -1774,6 +1922,7 @@ + @@ -2045,6 +2194,12 @@ + + + + + + @@ -2078,140 +2233,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + @@ -2418,6 +2451,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/parser/gapi2xml.pl b/parser/gapi2xml.pl index c2a178432..4181db508 100755 --- a/parser/gapi2xml.pl +++ b/parser/gapi2xml.pl @@ -296,7 +296,6 @@ foreach $cbname (sort(keys(%fpdefs))) { } } - ############################################################## # Parse the interfaces list. ############################################################## @@ -475,8 +474,7 @@ foreach $define (sort (keys (%defines))) { ############################################################## if ($ARGV[1]) { - open(XMLFILE, ">$ARGV[1]") || - die "Couldn't open $ARGV[1] for writing.\n"; + open(XMLFILE, ">$ARGV[1]") || die "Couldn't open $ARGV[1] for writing.\n"; print XMLFILE $doc->toString(); close(XMLFILE); } else { @@ -503,6 +501,7 @@ sub addFieldElems $field = $2; } next if ($field !~ /\S/); + $field =~ s/GSEAL\s*\((.*)\)/\1/g; $field =~ s/\s+(\*+)/\1 /g; $field =~ s/(const\s+)?(\w+)\*\s+const\*/const \2\*/g; $field =~ s/(\w+)\s+const\s*\*/const \1\*/g; diff --git a/sample/GtkDemo/Makefile.am b/sample/GtkDemo/Makefile.am index f7b1da29e..0c1e5f1cd 100644 --- a/sample/GtkDemo/Makefile.am +++ b/sample/GtkDemo/Makefile.am @@ -5,9 +5,9 @@ local_mono_cairo= endif assemblies = \ - $(top_builddir)/glib/glib-sharp.dll $(top_builddir)/pango/pango-sharp.dll \ - $(top_builddir)/atk/atk-sharp.dll $(top_builddir)/gdk/gdk-sharp.dll \ - $(top_builddir)/gtk/gtk-sharp.dll $(local_mono_cairo) + $(top_builddir)/glib/glib-sharp.dll $(top_builddir)/gio/gio-sharp.dll \ + $(top_builddir)/pango/pango-sharp.dll $(top_builddir)/atk/atk-sharp.dll \ + $(top_builddir)/gdk/gdk-sharp.dll $(top_builddir)/gtk/gtk-sharp.dll $(local_mono_cairo) references = $(addprefix /r:, $(assemblies)) @MONO_CAIRO_LIBS@ TARGETS = GtkDemo.exe diff --git a/sample/Makefile.am b/sample/Makefile.am index ef58893aa..b96214f50 100755 --- a/sample/Makefile.am +++ b/sample/Makefile.am @@ -26,7 +26,15 @@ TARGETS = polarfixed.exe custom-widget.exe custom-cellrenderer.exe gtk-hello-wor DEBUGS = $(addsuffix .mdb, $(TARGETS)) -assemblies=../glib/glib-sharp.dll ../pango/pango-sharp.dll ../atk/atk-sharp.dll ../gdk/gdk-sharp.dll ../gtk/gtk-sharp.dll $(GLADE_ASSEMBLY) +assemblies = \ + $(top_builddir)/glib/glib-sharp.dll \ + $(top_builddir)/gio/gio-sharp.dll \ + $(top_builddir)/pango/pango-sharp.dll \ + $(top_builddir)/atk/atk-sharp.dll \ + $(top_builddir)/gdk/gdk-sharp.dll \ + $(top_builddir)/gtk/gtk-sharp.dll \ + $(GLADE_ASSEMBLY) + references=$(addprefix /r:, $(assemblies)) noinst_SCRIPTS = $(TARGETS) diff --git a/sources/Makefile.am b/sources/Makefile.am index 555648ff8..f06e2b98d 100644 --- a/sources/Makefile.am +++ b/sources/Makefile.am @@ -1,30 +1,28 @@ -EXTRA_DIST = \ - README \ - gtk-sharp-2.12-sources.xml \ - gtkclipboard.patch \ - gtk_tree_model_signal_fix.patch \ - gtk_tree_model_signal_fix-2.10.patch +EXTRA_DIST = \ + README \ + sources.xml \ + gtk_tree_model_signal_fix.patch +MAJ=2.24 +PT=2.24.0 +TARGET_GTK_VERSION=2.14.3 -GTK_2_12_DOWNLOADS = \ - http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.0/sources/pango-1.18.2.tar.bz2 \ - http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.0/sources/atk-1.20.0.tar.bz2 \ - http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.0/sources/gtk+-2.12.0.tar.bz2 \ - http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.0/sources/libglade-2.6.2.tar.bz2 +GTK_DOWNLOADS = \ + http://ftp.gnome.org/pub/GNOME/platform/$(MAJ)/$(PT)/sources/glib-2.18.1.tar.bz2 \ + http://ftp.gnome.org/pub/GNOME/platform/$(MAJ)/$(PT)/sources/pango-1.22.0.tar.bz2 \ + http://ftp.gnome.org/pub/GNOME/platform/$(MAJ)/$(PT)/sources/atk-1.24.0.tar.bz2 \ + http://ftp.gnome.org/pub/GNOME/platform/$(MAJ)/$(PT)/sources/gtk+-$(TARGET_GTK_VERSION).tar.bz2 \ + http://ftp.gnome.org/pub/GNOME/platform/$(MAJ)/$(PT)/sources/libglade-2.6.3.tar.bz2 -api: api-2.12 +api: + PATH=../parser:$$PATH $(RUNTIME) ../parser/gapi-parser.exe sources.xml -api-2.12: - PATH=../parser:$$PATH $(RUNTIME) ../parser/gapi-parser.exe gtk-sharp-2.12-sources.xml - -get-source-code: get-2.12-sources - -get-2.12-sources: - for i in $(GTK_2_12_DOWNLOADS); do \ +get-source-code: + for i in $(GTK_DOWNLOADS); do \ wget $$i --output-document=- | tar -xj ; \ done; - ln -f -s gtkfilechooserprivate.h gtk+-2.12.0/gtk/gtkfilechooserpriv.h - patch -p0 gtk+-2.12.0/gtk/gtktreemodel.c < gtk_tree_model_signal_fix-2.10.patch - echo "typedef struct _GtkClipboard GtkClipboard;" >> gtk+-2.12.0/gtk/gtkclipboard.h - echo "typedef struct _GtkClipboardClass GtkClipboardClass;" >> gtk+-2.12.0/gtk/gtkclipboard.h + ln -f -s gtkfilechooserprivate.h gtk+-$(TARGET_GTK_VERSION)/gtk/gtkfilechooserpriv.h + patch -p0 gtk+-$(TARGET_GTK_VERSION)/gtk/gtktreemodel.c < gtk_tree_model_signal_fix.patch + echo "typedef struct _GtkClipboard GtkClipboard;" >> gtk+-$(TARGET_GTK_VERSION)/gtk/gtkclipboard.h + echo "typedef struct _GtkClipboardClass GtkClipboardClass;" >> gtk+-$(TARGET_GTK_VERSION)/gtk/gtkclipboard.h diff --git a/sources/gtk_tree_model_signal_fix-2.10.patch b/sources/gtk_tree_model_signal_fix-2.10.patch deleted file mode 100644 index 537d763fa..000000000 --- a/sources/gtk_tree_model_signal_fix-2.10.patch +++ /dev/null @@ -1,58 +0,0 @@ -173,180c173,181 -< g_signal_newv (I_("row_inserted"), -< GTK_TYPE_TREE_MODEL, -< G_SIGNAL_RUN_FIRST, -< closure, -< NULL, NULL, -< _gtk_marshal_VOID__BOXED_BOXED, -< G_TYPE_NONE, 2, -< row_inserted_params); ---- -> g_signal_new ("row_inserted", -> GTK_TYPE_TREE_MODEL, -> G_SIGNAL_RUN_FIRST, -> G_STRUCT_OFFSET (GtkTreeModelIface, row_inserted), -> NULL, NULL, -> _gtk_marshal_VOID__BOXED_BOXED, -> G_TYPE_NONE, 2, -> GTK_TYPE_TREE_PATH, -> GTK_TYPE_TREE_ITER); -196,203c197,204 -< g_signal_newv (I_("row_deleted"), -< GTK_TYPE_TREE_MODEL, -< G_SIGNAL_RUN_FIRST, -< closure, -< NULL, NULL, -< _gtk_marshal_VOID__BOXED, -< G_TYPE_NONE, 1, -< row_deleted_params); ---- -> g_signal_new ("row_deleted", -> GTK_TYPE_TREE_MODEL, -> G_SIGNAL_RUN_FIRST, -> G_STRUCT_OFFSET (GtkTreeModelIface, row_deleted), -> NULL, NULL, -> _gtk_marshal_VOID__BOXED, -> G_TYPE_NONE, 1, -> GTK_TYPE_TREE_PATH); -208,215c209,219 -< g_signal_newv (I_("rows_reordered"), -< GTK_TYPE_TREE_MODEL, -< G_SIGNAL_RUN_FIRST, -< closure, -< NULL, NULL, -< _gtk_marshal_VOID__BOXED_BOXED_POINTER, -< G_TYPE_NONE, 3, -< rows_reordered_params); ---- -> g_signal_new ("rows_reordered", -> GTK_TYPE_TREE_MODEL, -> G_SIGNAL_RUN_FIRST, -> G_STRUCT_OFFSET (GtkTreeModelIface, rows_reordered), -> NULL, NULL, -> _gtk_marshal_VOID__BOXED_BOXED_POINTER, -> G_TYPE_NONE, 3, -> GTK_TYPE_TREE_PATH, -> GTK_TYPE_TREE_ITER, -> G_TYPE_POINTER); -> diff --git a/sources/gtk_tree_model_signal_fix.patch b/sources/gtk_tree_model_signal_fix.patch index 2350379dd..be9c74eee 100644 --- a/sources/gtk_tree_model_signal_fix.patch +++ b/sources/gtk_tree_model_signal_fix.patch @@ -1,58 +1,58 @@ -173,180c173,181 -< g_signal_newv ("row_inserted", -< GTK_TYPE_TREE_MODEL, -< G_SIGNAL_RUN_FIRST, -< closure, -< NULL, NULL, -< _gtk_marshal_VOID__BOXED_BOXED, -< G_TYPE_NONE, 2, -< row_inserted_params); ---- -> g_signal_new ("row_inserted", -> GTK_TYPE_TREE_MODEL, -> G_SIGNAL_RUN_FIRST, -> G_STRUCT_OFFSET (GtkTreeModelIface, row_inserted), -> NULL, NULL, -> _gtk_marshal_VOID__BOXED_BOXED, -> G_TYPE_NONE, 2, -> GTK_TYPE_TREE_PATH, -> GTK_TYPE_TREE_ITER); -196,203c197,204 -< g_signal_newv ("row_deleted", -< GTK_TYPE_TREE_MODEL, -< G_SIGNAL_RUN_FIRST, -< closure, -< NULL, NULL, -< _gtk_marshal_VOID__BOXED, -< G_TYPE_NONE, 1, -< row_deleted_params); ---- -> g_signal_new ("row_deleted", -> GTK_TYPE_TREE_MODEL, -> G_SIGNAL_RUN_FIRST, -> G_STRUCT_OFFSET (GtkTreeModelIface, row_deleted), -> NULL, NULL, -> _gtk_marshal_VOID__BOXED, -> G_TYPE_NONE, 1, -> GTK_TYPE_TREE_PATH); -208,215c209,219 -< g_signal_newv ("rows_reordered", -< GTK_TYPE_TREE_MODEL, -< G_SIGNAL_RUN_FIRST, -< closure, -< NULL, NULL, -< _gtk_marshal_VOID__BOXED_BOXED_POINTER, -< G_TYPE_NONE, 3, -< rows_reordered_params); ---- -> g_signal_new ("rows_reordered", -> GTK_TYPE_TREE_MODEL, -> G_SIGNAL_RUN_FIRST, -> G_STRUCT_OFFSET (GtkTreeModelIface, rows_reordered), -> NULL, NULL, -> _gtk_marshal_VOID__BOXED_BOXED_POINTER, -> G_TYPE_NONE, 3, -> GTK_TYPE_TREE_PATH, -> GTK_TYPE_TREE_ITER, -> G_TYPE_POINTER); -> +--- gtk+-2.14.3/gtk/gtktreemodel.c 2009-01-04 11:52:01.000000000 -0600 ++++ gtktreemodel.c 2009-01-04 12:03:58.000000000 -0600 +@@ -193,14 +193,15 @@ + closure = g_closure_new_simple (sizeof (GClosure), NULL); + g_closure_set_marshal (closure, row_inserted_marshal); + tree_model_signals[ROW_INSERTED] = +- g_signal_newv (I_("row-inserted"), ++ g_signal_new (I_("row-inserted"), + GTK_TYPE_TREE_MODEL, + G_SIGNAL_RUN_FIRST, +- closure, ++ G_STRUCT_OFFSET (GtkTreeModelIface, row_inserted), + NULL, NULL, + _gtk_marshal_VOID__BOXED_BOXED, + G_TYPE_NONE, 2, +- row_inserted_params); ++ GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE, ++ GTK_TYPE_TREE_ITER); + + /** + * GtkTreeModel::row-has-child-toggled: +@@ -242,14 +243,14 @@ + closure = g_closure_new_simple (sizeof (GClosure), NULL); + g_closure_set_marshal (closure, row_deleted_marshal); + tree_model_signals[ROW_DELETED] = +- g_signal_newv (I_("row-deleted"), ++ g_signal_new (I_("row-deleted"), + GTK_TYPE_TREE_MODEL, + G_SIGNAL_RUN_FIRST, +- closure, ++ G_STRUCT_OFFSET (GtkTreeModelIface, row_deleted), + NULL, NULL, + _gtk_marshal_VOID__BOXED, + G_TYPE_NONE, 1, +- row_deleted_params); ++ GTK_TYPE_TREE_PATH); + + /** + * GtkTreeModel::rows-reordered: +@@ -268,14 +269,15 @@ + closure = g_closure_new_simple (sizeof (GClosure), NULL); + g_closure_set_marshal (closure, rows_reordered_marshal); + tree_model_signals[ROWS_REORDERED] = +- g_signal_newv (I_("rows-reordered"), ++ g_signal_new (I_("rows-reordered"), + GTK_TYPE_TREE_MODEL, + G_SIGNAL_RUN_FIRST, +- closure, ++ G_STRUCT_OFFSET (GtkTreeModelIface, rows_reordered), + NULL, NULL, + _gtk_marshal_VOID__BOXED_BOXED_POINTER, + G_TYPE_NONE, 3, +- rows_reordered_params); ++ GTK_TYPE_TREE_PATH | G_SIGNAL_TYPE_STATIC_SCOPE, ++ GTK_TYPE_TREE_ITER, G_TYPE_POINTER); + initialized = TRUE; + } + } diff --git a/sources/gtkclipboard.patch b/sources/gtkclipboard.patch deleted file mode 100644 index 4bef84105..000000000 --- a/sources/gtkclipboard.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- gtkclipboard.h.orig 2005-03-18 15:41:55.748377369 -0500 -+++ gtkclipboard.h 2005-03-18 15:45:36.752348627 -0500 -@@ -32,6 +32,9 @@ - #define GTK_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CLIPBOARD, GtkClipboard)) - #define GTK_IS_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CLIPBOARD)) - -+typedef struct _GtkClipboard GtkClipboard; -+typedef struct _GtkClipboardClass GtkClipboardClass; -+ - typedef void (* GtkClipboardReceivedFunc) (GtkClipboard *clipboard, - GtkSelectionData *selection_data, - gpointer data); diff --git a/sources/gtkhtml-font-style-enum.patch b/sources/gtkhtml-font-style-enum.patch deleted file mode 100644 index c2b58d3e3..000000000 --- a/sources/gtkhtml-font-style-enum.patch +++ /dev/null @@ -1,51 +0,0 @@ -Index: gtkhtml-3.0.10/src/gtkhtml-enums.h -=================================================================== -RCS file: /cvs/gnome/gtkhtml/src/gtkhtml-enums.h,v -retrieving revision 1.35 -diff -u -p -r1.35 gtkhtml-enums.h ---- gtkhtml-3.0.10/src/gtkhtml-enums.h 19 May 2003 14:41:02 -0000 1.35 -+++ gtkhtml-3.0.10/src/gtkhtml-enums.h 16 Jul 2003 02:06:40 -0000 -@@ -242,15 +242,13 @@ typedef enum { - } GtkHTMLEtchStyle; - - typedef enum { -- GTK_HTML_FONT_STYLE_SHIFT_FIRST = 3, -- GTK_HTML_FONT_STYLE_SHIFT_BOLD = GTK_HTML_FONT_STYLE_SHIFT_FIRST, -- GTK_HTML_FONT_STYLE_SHIFT_ITALIC, -- GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE, -- GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT, -- GTK_HTML_FONT_STYLE_SHIFT_FIXED, -- GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT, -- GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT, -- GTK_HTML_FONT_STYLE_SHIFT_LAST = GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT, -+ GTK_HTML_FONT_STYLE_SHIFT_BOLD = 3, -+ GTK_HTML_FONT_STYLE_SHIFT_ITALIC = 4, -+ GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE = 5, -+ GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT = 6, -+ GTK_HTML_FONT_STYLE_SHIFT_FIXED = 7, -+ GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT = 8, -+ GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT = 9, - } GtkHTMLFontStyleShift; - - typedef enum { -@@ -263,13 +261,13 @@ typedef enum { - GTK_HTML_FONT_STYLE_SIZE_6 = 6, - GTK_HTML_FONT_STYLE_SIZE_7 = 7, - GTK_HTML_FONT_STYLE_SIZE_MASK = 0x7, -- GTK_HTML_FONT_STYLE_BOLD = 1 << GTK_HTML_FONT_STYLE_SHIFT_BOLD, -- GTK_HTML_FONT_STYLE_ITALIC = 1 << GTK_HTML_FONT_STYLE_SHIFT_ITALIC, -- GTK_HTML_FONT_STYLE_UNDERLINE = 1 << GTK_HTML_FONT_STYLE_SHIFT_UNDERLINE, -- GTK_HTML_FONT_STYLE_STRIKEOUT = 1 << GTK_HTML_FONT_STYLE_SHIFT_STRIKEOUT, -- GTK_HTML_FONT_STYLE_FIXED = 1 << GTK_HTML_FONT_STYLE_SHIFT_FIXED, -- GTK_HTML_FONT_STYLE_SUBSCRIPT = 1 << GTK_HTML_FONT_STYLE_SHIFT_SUBSCRIPT, -- GTK_HTML_FONT_STYLE_SUPERSCRIPT = 1 << GTK_HTML_FONT_STYLE_SHIFT_SUPERSCRIPT, -+ GTK_HTML_FONT_STYLE_BOLD = 1 << 3, -+ GTK_HTML_FONT_STYLE_ITALIC = 1 << 4, -+ GTK_HTML_FONT_STYLE_UNDERLINE = 1 << 5, -+ GTK_HTML_FONT_STYLE_STRIKEOUT = 1 << 6, -+ GTK_HTML_FONT_STYLE_FIXED = 1 << 7, -+ GTK_HTML_FONT_STYLE_SUBSCRIPT = 1 << 8, -+ GTK_HTML_FONT_STYLE_SUPERSCRIPT = 1 << 9, - } GtkHTMLFontStyle; - - typedef enum { diff --git a/sources/gtk-sharp-2.12-sources.xml b/sources/sources.xml similarity index 75% rename from sources/gtk-sharp-2.12-sources.xml rename to sources/sources.xml index abfb45bf6..318fe5ea1 100644 --- a/sources/gtk-sharp-2.12-sources.xml +++ b/sources/sources.xml @@ -1,15 +1,48 @@ - - - - atk-1.20.0/atk + + + + + gasynchelper.h + gcontenttypeprivate.h + gdummyfile.h + gfileattribute-priv.h + gioalias.h + gio-marshal.h + giomodule-priv.h + glocalfile.h + glocalfileinfo.h + glocalfileinputstream.h + glocalfilemonitor.h + glocalfileoutputstream.h + glocalvfs.h + gmountprivate.h + gpollfilemonitor.h + gunionvolumemonitor.h + gunixinputstream.h + gunixmount.h + gunixmounts.h + gunixoutputstream.h + gunixvolume.h + gunixvolumemonitor.h + gwin32appinfo.h + gwin32mount.h + gwin32volumemonitor.h + - + + + + atk-1.24.0/atk + + + + - + pangoatsui.c pangoatsui.h pangoatsui-fontmap.h @@ -47,18 +80,23 @@ - + - + gdkalias.h + gdkwindowimpl.h keyname-table.h - + + io-gdip-native.h + io-gdip-propertytags.h + io-gdip-utils.h + io-gdip-animation.h gdk-pixbuf-alias.h gdk-pixbuf-scaled-anim.h xpm-color-table.h @@ -66,10 +104,10 @@ - + - + gtkalias.h gtkbuiltincache.h @@ -97,6 +135,7 @@ gtkiconcachevalidator.c gtkiconcachevalidator.h gtkiconthemeparser.h + gtkimcontextsimpleseqs.h gtkpathbar.c gtkpathbar.h gtkprintbackend.h @@ -164,10 +203,10 @@ - + - libglade-2.6.2/glade + libglade-2.6.3/glade