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
This commit is contained in:
Gonzalo Paniagua Javier 2003-08-30 00:26:38 +00:00
parent fed536085d
commit 0663cb37ba
4 changed files with 17 additions and 14 deletions

View File

@ -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> 2003-08-28 Martin Willemoes Hansen <mwh@sysrq.dk>
* gdk/Pixbuf.custom: Added missing DllImport statement and * gdk/Pixbuf.custom: Added missing DllImport statement and

View File

@ -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); 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) { public Gdk.Pixbuf ScaleSimple(int dest_width, int dest_height, Gdk.InterpType interp_type) {
@ -55,7 +55,7 @@
return ret; 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); 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) { 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; 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); 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) { public Gdk.Pixbuf AddAlpha(bool substitute_color, byte r, byte g, byte b) {
@ -78,7 +78,7 @@
// are currently miss-generated. // are currently miss-generated.
// //
[DllImport("gdk_pixbuf-2.0")] [DllImport("libgdk_pixbuf-2.0-0.dll")]
static extern IntPtr gdk_pixbuf_new_from_data( static extern IntPtr gdk_pixbuf_new_from_data(
byte [] data, int colorspace, bool has_alpha, byte [] data, int colorspace, bool has_alpha,
int bits_per_sample, int width, int height, int rowstride, 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); 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) public unsafe Pixbuf(byte[] data, bool copy_pixels)
@ -102,7 +102,7 @@
if (error != IntPtr.Zero) throw new GLib.GException (error); 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); 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) public unsafe Pixbuf(int data_length, void *data, bool copy_pixels)
{ {
@ -127,12 +127,6 @@
// operation will create the Pixbuf instead of two // 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) { 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); 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); return new Pixbuf (raw_ret);

View File

@ -11,7 +11,7 @@ namespace GLib
public class Thread public class Thread
{ {
[DllImport("gthread-2.0")] [DllImport("libgthread-2.0-0.dll")]
static extern void g_thread_init (IntPtr i); static extern void g_thread_init (IntPtr i);
public static void Init () public static void Init ()

View File

@ -21,7 +21,7 @@ namespace Gtk {
/// <summary> /// <summary>
/// Utility class to help writting multi-threaded Gtk applications /// Utility class to help writting multi-threaded Gtk applications
/// </summary> /// </summary>
/// <remarks> /// <remarks/>
/// ///
public class ThreadNotify { public class ThreadNotify {