From b39bc105e65c8fed76fd4cb84b97c5b5bed24a1c Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@novell.com>
Date: Sat, 19 Jun 2004 14:46:11 +0000
Subject: [PATCH] 2004-06-17  Larry Ewing  <lewing@ximian.com>

	* gdk/Makefile.am (sources): add Pixdata.custom

	* gdk/Pixdata.custom: add new file to fix Serialize.

	* gnome/CanvasItem.custom: remove the incorrect custom bindings.

	* gnome/Gnome.metadata: stop hiding the AffineRelative and
	AffineAbsolute the generator gets them right they are not out
	params.

	* gdk/Gdk.metadata: mark the Pixdata byte stream as and array hide
	the broken serialize method.

svn path=/trunk/gtk-sharp/; revision=29941
---
 ChangeLog               | 15 +++++++++++++++
 gdk/Gdk.metadata        |  2 ++
 gdk/Makefile.am         |  1 +
 gdk/Pixdata.custom      | 16 ++++++++++++++++
 gnome/CanvasItem.custom | 16 ----------------
 gnome/Gnome.metadata    |  2 --
 6 files changed, 34 insertions(+), 18 deletions(-)
 create mode 100644 gdk/Pixdata.custom

diff --git a/ChangeLog b/ChangeLog
index b093f55f9..54ad91893 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-06-17  Larry Ewing  <lewing@ximian.com>
+
+	* gdk/Makefile.am (sources): add Pixdata.custom
+
+	* gdk/Pixdata.custom: add new file to fix Serialize.
+
+	* gnome/CanvasItem.custom: remove the incorrect custom bindings.
+
+	* gnome/Gnome.metadata: stop hiding the AffineRelative and
+	AffineAbsolute the generator gets them right they are not out
+	params.
+
+	* gdk/Gdk.metadata: mark the Pixdata byte stream as and array hide
+	the broken serialize method.
+
 2004-06-18  John Luke  <jluke@cfl.rr.com>
 
 	* sample/rsvg/Makefile.am:  do not reference gnome-sharp and art-sharp
diff --git a/gdk/Gdk.metadata b/gdk/Gdk.metadata
index 5184ab421..3deedf2b0 100644
--- a/gdk/Gdk.metadata
+++ b/gdk/Gdk.metadata
@@ -99,6 +99,8 @@
   <attr path="/api/namespace/struct[@cname='GdkEventSetting']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkEventVisibility']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkEventWindowState']" name="hidden">1</attr>
+  <attr path="/api/namespace/struct[@cname='GdkPixdata']/method[@name='Deserialize']/*/*[@name='stream']" name="array">1</attr>
+  <attr path="/api/namespace/struct[@cname='GdkPixdata']/method[@name='Serialize']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkPixmapObject']" name="hidden">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkRegion']" name="opaque">1</attr>
   <attr path="/api/namespace/struct[@cname='GdkRegion']/method[@name='GetRectangles']" name="hidden">1</attr>
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index f4a0918c8..9f6b7c8fa 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -50,6 +50,7 @@ customs = 			\
 	Global.custom		\
 	Pixbuf.custom		\
 	PixbufLoader.custom	\
+	Pixdata.custom		\
 	Point.custom		\
 	Rectangle.custom	\
 	Region.custom		\
diff --git a/gdk/Pixdata.custom b/gdk/Pixdata.custom
new file mode 100644
index 000000000..5f77d43fd
--- /dev/null
+++ b/gdk/Pixdata.custom
@@ -0,0 +1,16 @@
+// Pixdata.Custom 
+//
+// (C) 2004 Novell, Inc.
+
+	[DllImport("libgdk_pixbuf-2.0-0.dll")]
+	static extern IntPtr gdk_pixdata_serialize (ref Gdk.Pixdata raw, out uint len);
+	
+	public byte [] Serialize () {
+		uint len;
+		IntPtr raw_ret = gdk_pixdata_serialize (ref this, out len);
+
+		byte [] data = new byte [len];
+		Marshal.Copy (raw_ret, data, 0, (int)len);
+		
+		return data;
+	}	
diff --git a/gnome/CanvasItem.custom b/gnome/CanvasItem.custom
index 72c262e22..4bd2d0449 100644
--- a/gnome/CanvasItem.custom
+++ b/gnome/CanvasItem.custom
@@ -25,22 +25,6 @@
                 	get { return GLib.Object.GetObject (gtksharp_gnome_canvas_item_get_canvas (this.Handle), false) as Canvas; }
                 }
 
-		[DllImport("gnomecanvas-2")]
-		static extern void gnome_canvas_item_affine_relative(IntPtr raw, double[] affine);
-
-		public void AffineRelative (out double[] affine) {
-                        affine = new double [6];
-			gnome_canvas_item_affine_relative(Handle, affine);
-		}
-
-		[DllImport("gnomecanvas-2")]
-		static extern void gnome_canvas_item_affine_absolute(IntPtr raw, double[] affine);
-
-		public void AffineAbsolute (out double[] affine) {
-                        affine = new double [6];
-			gnome_canvas_item_affine_absolute(Handle, affine);
-		}
-
 		[DllImport("gnomecanvas-2")]
 		static extern void gnome_canvas_item_i2c_affine(IntPtr raw, double[] affine);
 
diff --git a/gnome/Gnome.metadata b/gnome/Gnome.metadata
index 8840d99d3..653bd5d12 100644
--- a/gnome/Gnome.metadata
+++ b/gnome/Gnome.metadata
@@ -37,8 +37,6 @@
   <attr path="/api/namespace/object[@cname='GnomeCanvas']/method[@name='W2cAffine']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GnomeCanvasClipgroup']/property[@name='Wind']" name="type">ArtWindRule</attr>
   <attr path="/api/namespace/object[@cname='GnomeCanvasItem']/constructor[@cname='gnome_canvas_item_new']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='GnomeCanvasItem']/method[@name='AffineAbsolute']" name="hidden">1</attr>
-  <attr path="/api/namespace/object[@cname='GnomeCanvasItem']/method[@name='AffineRelative']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GnomeCanvasItem']/method[@name='Construct']" name="hidden">1</attr>
   <attr path="/api/namespace/object[@cname='GnomeCanvasItem']/method[@name='GetBounds']/*/*[@type='double*']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GnomeCanvasItem']/method[@name='I2cAffine']" name="hidden">1</attr>