From 0663cb37ba4f0fec4208dcd8b0f9cde55712ac85 Mon Sep 17 00:00:00 2001
From: Gonzalo Paniagua Javier <gonzalo.mono@gmail.com>
Date: Sat, 30 Aug 2003 00:26:38 +0000
Subject: [PATCH] 2003-08-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* gdk/Pixbuf.custom: use windows dll name. Removed DllImport that is
	already in the generated file.

	* glib/Thread.cs: use windows dll name.

	* gtk/ThreadNotify.cs: close <remark> comment.

svn path=/trunk/gtk-sharp/; revision=17731
---
 ChangeLog           |  9 +++++++++
 gdk/Pixbuf.custom   | 18 ++++++------------
 glib/Thread.cs      |  2 +-
 gtk/ThreadNotify.cs |  2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6fa4c737c..553405f14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* gdk/Pixbuf.custom: use windows dll name. Removed DllImport that is
+	already in the generated file.
+
+	* glib/Thread.cs: use windows dll name.
+
+	* gtk/ThreadNotify.cs: close <remark> comment.
+
 2003-08-28  Martin Willemoes Hansen  <mwh@sysrq.dk>
 
 	* gdk/Pixbuf.custom: Added missing DllImport statement and
diff --git a/gdk/Pixbuf.custom b/gdk/Pixbuf.custom
index a25194260..8cbfa9605 100644
--- a/gdk/Pixbuf.custom
+++ b/gdk/Pixbuf.custom
@@ -46,7 +46,7 @@
 		}
 
 		
-		[DllImport("gdk_pixbuf-2.0")]
+		[DllImport("libgdk_pixbuf-2.0-0.dll")]
 		static extern IntPtr gdk_pixbuf_scale_simple(IntPtr raw, int dest_width, int dest_height, int interp_type);
 
 		public Gdk.Pixbuf ScaleSimple(int dest_width, int dest_height, Gdk.InterpType interp_type) {
@@ -55,7 +55,7 @@
 			return ret;
 		}
 
-		[DllImport("gdk_pixbuf-2.0")]
+		[DllImport("libgdk_pixbuf-2.0-0.dll")]
 		static extern IntPtr gdk_pixbuf_composite_color_simple(IntPtr raw, int dest_width, int dest_height, int interp_type, int overall_alpha, int check_size, uint color1, uint color2);
 
 		public Gdk.Pixbuf CompositeColorSimple(int dest_width, int dest_height, Gdk.InterpType interp_type, int overall_alpha, int check_size, uint color1, uint color2) {
@@ -64,7 +64,7 @@
 			return ret;
 		}
 
-		[DllImport("gdk_pixbuf-2.0")]
+		[DllImport("libgdk_pixbuf-2.0-0.dll")]
 		static extern IntPtr gdk_pixbuf_add_alpha(IntPtr raw, bool substitute_color, byte r, byte g, byte b);
 
 		public Gdk.Pixbuf AddAlpha(bool substitute_color, byte r, byte g, byte b) {
@@ -78,7 +78,7 @@
 // are currently miss-generated.
 //
 
-		[DllImport("gdk_pixbuf-2.0")]
+		[DllImport("libgdk_pixbuf-2.0-0.dll")]
 		static extern IntPtr gdk_pixbuf_new_from_data(
 					byte [] data, int colorspace, bool has_alpha, 
 					int bits_per_sample, int width, int height, int rowstride, 
@@ -92,7 +92,7 @@
 		}
 
 
-		[DllImport("gdk_pixbuf-2.0")]
+		[DllImport("libgdk_pixbuf-2.0-0.dll")]
 		static extern unsafe IntPtr gdk_pixbuf_new_from_inline(int len, byte [] data, bool copy_pixels, out IntPtr error);
 
 		public unsafe Pixbuf(byte[] data, bool copy_pixels)
@@ -102,7 +102,7 @@
 			if (error != IntPtr.Zero) throw new GLib.GException (error);
 		}
 
-		[DllImport("gdk_pixbuf-2.0")]
+		[DllImport("libgdk_pixbuf-2.0-0.dll")]
 		static extern unsafe IntPtr gdk_pixbuf_new_from_inline(int len, IntPtr data, bool copy_pixels, out IntPtr error);
 		public unsafe Pixbuf(int data_length, void *data, bool copy_pixels)
 		{
@@ -127,12 +127,6 @@
 // operation will create the Pixbuf instead of two
 //
 
-                [DllImport("libgdk_pixbuf-2.0-0.dll")]
-		static extern IntPtr gdk_pixbuf_get_from_drawable (
-                              IntPtr nullpointer, IntPtr src, IntPtr cmap, 
-			      int src_x, int src_y, int dest_x, int dest_y, 
-			      int width, int height);
-
 		public Gdk.Pixbuf CreateFromDrawable (Gdk.Drawable src, Gdk.Colormap cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height) {
 			IntPtr raw_ret = gdk_pixbuf_get_from_drawable((IntPtr) 0, src.Handle, cmap.Handle, src_x, src_y, dest_x, dest_y, width, height);
 			return new Pixbuf (raw_ret);
diff --git a/glib/Thread.cs b/glib/Thread.cs
index 8fcde6f54..7ad7fd8d7 100644
--- a/glib/Thread.cs
+++ b/glib/Thread.cs
@@ -11,7 +11,7 @@ namespace GLib
 
 	public class Thread
 	{
-		[DllImport("gthread-2.0")]
+		[DllImport("libgthread-2.0-0.dll")]
 		static extern void g_thread_init (IntPtr i);
 
 		public static void Init ()
diff --git a/gtk/ThreadNotify.cs b/gtk/ThreadNotify.cs
index 4b9128a62..9db6f201a 100644
--- a/gtk/ThreadNotify.cs
+++ b/gtk/ThreadNotify.cs
@@ -21,7 +21,7 @@ namespace Gtk {
 	/// <summary>
 	///   Utility class to help writting multi-threaded Gtk applications
 	/// </summary>
-	/// <remarks>
+	/// <remarks/>
 	///   
 	public class ThreadNotify {