From 70d1b232f258a69658ec78176d462ad8fe7dd276 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Wed, 9 Feb 2011 23:39:39 -0600 Subject: [PATCH] DllImport updates for gdk. --- gdk/Color.custom | 2 +- gdk/Device.custom | 6 ++-- gdk/Display.custom | 8 ++--- gdk/DisplayManager.custom | 2 +- gdk/Drawable.custom | 65 ------------------------------------ gdk/Event.cs | 2 +- gdk/Global.custom | 12 +++---- gdk/Input.custom | 2 +- gdk/Keymap.custom | 4 +-- gdk/Makefile.am | 2 -- gdk/Pixmap.custom | 66 ------------------------------------- gdk/Property.custom | 4 +-- gdk/Region.custom | 2 +- gdk/Screen.custom | 8 ++--- gdk/TextProperty.cs | 6 ++-- gdk/Window.custom | 16 ++++----- gdk/gdk-sharp.dll.config.in | 2 +- 17 files changed, 38 insertions(+), 171 deletions(-) delete mode 100644 gdk/Drawable.custom delete mode 100644 gdk/Pixmap.custom diff --git a/gdk/Color.custom b/gdk/Color.custom index e48d43a46..e5cb581b8 100644 --- a/gdk/Color.custom +++ b/gdk/Color.custom @@ -30,7 +30,7 @@ public Color (byte r, byte g, byte b) Pixel = 0; } -[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern uint gdk_color_hash(ref Gdk.Color raw); public override int GetHashCode() { diff --git a/gdk/Device.custom b/gdk/Device.custom index 427bc50b2..f67891980 100644 --- a/gdk/Device.custom +++ b/gdk/Device.custom @@ -22,7 +22,7 @@ [DllImport("gdksharpglue-3")] static extern DeviceKey gtksharp_gdk_device_get_device_key (IntPtr device, uint axis); - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_device_get_state(IntPtr device, IntPtr window, double [] axes, out int maskAsInt); @@ -39,10 +39,10 @@ return gtksharp_gdk_device_get_device_key (Handle, axis); } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_device_free_history(IntPtr events, int n_events); - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gdk_device_get_history(IntPtr device, IntPtr window, uint start, uint stop, out IntPtr events, out int n_events); public TimeCoord[] GetHistory (Gdk.Window window, uint start, uint stop) diff --git a/gdk/Display.custom b/gdk/Display.custom index 41f5457e0..f8b7cb350 100644 --- a/gdk/Display.custom +++ b/gdk/Display.custom @@ -18,7 +18,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_display_get_pointer(IntPtr raw, IntPtr screen, out int x, out int y, out int mask); [Obsolete] @@ -28,7 +28,7 @@ mask = (Gdk.ModifierType) mask_as_int; } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_display_get_pointer(IntPtr raw, out IntPtr screen, out int x, out int y, out int mask); public void GetPointer(out Gdk.Screen screen, out int x, out int y, out Gdk.ModifierType mask) { @@ -58,7 +58,7 @@ GetPointer (out screen, out x, out y, out mod); } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gdk_display_list_devices (IntPtr raw); public Device[] ListDevices () @@ -73,7 +73,7 @@ return result; } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_display_add_client_message_filter (IntPtr raw, IntPtr message_type, GdkSharp.FilterFuncNative func, IntPtr data); public void AddClientMessageFilter (Gdk.Atom message_type, Gdk.FilterFunc func) diff --git a/gdk/DisplayManager.custom b/gdk/DisplayManager.custom index ceb783527..b9c35d72e 100644 --- a/gdk/DisplayManager.custom +++ b/gdk/DisplayManager.custom @@ -18,7 +18,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gdk_display_manager_list_displays (IntPtr raw); public Display[] ListDisplays () diff --git a/gdk/Drawable.custom b/gdk/Drawable.custom deleted file mode 100644 index 59cc166cd..000000000 --- a/gdk/Drawable.custom +++ /dev/null @@ -1,65 +0,0 @@ -// Gdk.Drawble.custom - Gdk Drawble class customizations -// -// Author: Pedro Abelleira Seco -// -// 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 void DrawRectangle(Gdk.GC gc, bool filled, Gdk.Rectangle area) -{ - gdk_draw_rectangle(Handle, gc.Handle, filled, area.X, area.Y, area.Width, area.Height); -} - -[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] -static extern void gdk_draw_polygon(IntPtr raw, IntPtr gc, int filled, Gdk.Point[] points, int npoints); - -[Obsolete] -public void DrawPolygon(Gdk.GC gc, int filled, Gdk.Point[] points) -{ - gdk_draw_polygon(Handle, gc.Handle, filled, points, points.Length); -} - -public void DrawPolygon(Gdk.GC gc, bool filled, Gdk.Point[] points) -{ - gdk_draw_polygon(Handle, gc.Handle, filled ? 1 : 0, points, points.Length); -} - -[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] -static extern void gdk_draw_lines(IntPtr raw, IntPtr gc, Gdk.Point[] points, int npoints); - -public void DrawLines(Gdk.GC gc, Gdk.Point[] points) -{ - gdk_draw_lines(Handle, gc.Handle, points, points.Length); -} - -[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] -internal static extern IntPtr gdk_x11_drawable_get_xdisplay (IntPtr raw); - -[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] -internal static extern IntPtr gdk_x11_drawable_get_xid (IntPtr raw); - -#if MANLY_ENOUGH_TO_INCLUDE - public virtual Cairo.Graphics CairoGraphics () - { - Cairo.Graphics o = new Cairo.Graphics (); - - IntPtr display = gdk_x11_drawable_get_xdisplay (Handle); - o.SetTargetDrawable (display, gdk_x11_drawable_get_xid (Handle)); - - return o; - } -#endif diff --git a/gdk/Event.cs b/gdk/Event.cs index de4613896..48d5489ef 100644 --- a/gdk/Event.cs +++ b/gdk/Event.cs @@ -39,7 +39,7 @@ namespace Gdk { get { return raw; } } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gdk_event_get_type (); public static GLib.GType GType { diff --git a/gdk/Global.custom b/gdk/Global.custom index aaa6313b0..2ab746684 100644 --- a/gdk/Global.custom +++ b/gdk/Global.custom @@ -19,7 +19,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gdk_devices_list (); public static Device[] DevicesList () @@ -34,7 +34,7 @@ return result; } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gdk_list_visuals (); public static Visual[] ListVisuals () @@ -113,7 +113,7 @@ } } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gdk_init_check(ref int argc, ref IntPtr argv); public static bool InitCheck (ref string[] argv) @@ -127,7 +127,7 @@ return result; } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_parse_args(ref int argc, ref IntPtr argv); public static void ParseArgs (ref string[] argv) @@ -140,7 +140,7 @@ argv = a.GetArgs (argc); } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_query_depths (out IntPtr depths, out int n_depths); public static int[] QueryDepths () @@ -152,7 +152,7 @@ Marshal.Copy (ptr, result, 0, count); return result; } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_query_visual_types (out IntPtr types, out int n_types); public static VisualType[] QueryVisualTypes () diff --git a/gdk/Input.custom b/gdk/Input.custom index 44f2857ef..91f17c990 100644 --- a/gdk/Input.custom +++ b/gdk/Input.custom @@ -20,7 +20,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int gdk_input_add_full (int source, int condition, GdkSharp.InputFunctionNative function, IntPtr data, GLib.DestroyNotify destroy); [Obsolete] diff --git a/gdk/Keymap.custom b/gdk/Keymap.custom index 8b7216cff..31070aa79 100644 --- a/gdk/Keymap.custom +++ b/gdk/Keymap.custom @@ -22,7 +22,7 @@ [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_free(IntPtr ptr); - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gdk_keymap_get_entries_for_keycode(IntPtr raw, uint hardware_keycode, out IntPtr keys, out IntPtr keyvals, out int n_entries); public void GetEntriesForKeycode(uint hardware_keycode, out Gdk.KeymapKey[] keys, out uint[] keyvals) @@ -47,7 +47,7 @@ } } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gdk_keymap_get_entries_for_keyval(IntPtr raw, uint keyval, out IntPtr keys, out int n_keys); public KeymapKey[] GetEntriesForKeyval (uint keyval) diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 3626cbff2..5eb880491 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -38,7 +38,6 @@ customs = \ DeviceAxis.custom \ Display.custom \ DisplayManager.custom \ - Drawable.custom \ EdgeTable.custom \ GCValues.custom \ Global.custom \ @@ -47,7 +46,6 @@ customs = \ PangoAttrEmbossed.custom\ PangoAttrEmbossColor.custom \ PangoAttrStipple.custom \ - Pixmap.custom \ Pixbuf.custom \ PixbufAnimation.custom \ PixbufFrame.custom \ diff --git a/gdk/Pixmap.custom b/gdk/Pixmap.custom deleted file mode 100644 index 75a8b3a38..000000000 --- a/gdk/Pixmap.custom +++ /dev/null @@ -1,66 +0,0 @@ -// Gdk.Pixmap.custom - Pixmap extensions -// -// Authors: Mike Kestner -// -// Copyright (c) 2004 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 Pixmap (Gdk.Drawable drawable, int width, int height) : this (drawable, width, height, -1) {} - - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr gdk_pixmap_colormap_create_from_xpm (IntPtr drawable, IntPtr colormap, IntPtr mask, IntPtr transparent_color, IntPtr filename); - - public static Gdk.Pixmap ColormapCreateFromXpm(Gdk.Drawable drawable, Gdk.Colormap colormap, string filename) - { - IntPtr native = GLib.Marshaller.StringToPtrGStrdup (filename); - IntPtr raw_ret = gdk_pixmap_colormap_create_from_xpm (drawable.Handle, colormap.Handle, IntPtr.Zero, IntPtr.Zero, native); - GLib.Marshaller.Free (native); - return GLib.Object.GetObject (raw_ret) as Gdk.Pixmap; - } - - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr gdk_pixmap_colormap_create_from_xpm_d (IntPtr drawable, IntPtr colormap, IntPtr mask, IntPtr transparent_color, IntPtr data); - - public static Gdk.Pixmap ColormapCreateFromXpmD(Gdk.Drawable drawable, Gdk.Colormap colormap, string data) - { - IntPtr native = GLib.Marshaller.StringToPtrGStrdup (data); - IntPtr raw_ret = gdk_pixmap_colormap_create_from_xpm_d (drawable.Handle, colormap.Handle, IntPtr.Zero, IntPtr.Zero, native); - GLib.Marshaller.Free (native); - return GLib.Object.GetObject (raw_ret) as Gdk.Pixmap; - } - - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr gdk_pixmap_create_from_xpm (IntPtr drawable, IntPtr mask, IntPtr transparent_color, IntPtr filename); - - public static Gdk.Pixmap CreateFromXpm(Gdk.Drawable drawable, string filename) - { - IntPtr native = GLib.Marshaller.StringToPtrGStrdup (filename); - IntPtr raw_ret = gdk_pixmap_create_from_xpm (drawable.Handle, IntPtr.Zero, IntPtr.Zero, native); - GLib.Marshaller.Free (native); - return GLib.Object.GetObject (raw_ret) as Gdk.Pixmap; - } - - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] - static extern IntPtr gdk_pixmap_create_from_xpm_d (IntPtr drawable, IntPtr mask, IntPtr transparent_color, IntPtr data); - - public static Gdk.Pixmap CreateFromXpmD(Gdk.Drawable drawable, string data) - { - IntPtr native = GLib.Marshaller.StringToPtrGStrdup (data); - IntPtr raw_ret = gdk_pixmap_create_from_xpm_d (drawable.Handle, IntPtr.Zero, IntPtr.Zero, native); - GLib.Marshaller.Free (native); - return GLib.Object.GetObject (raw_ret) as Gdk.Pixmap; - } - diff --git a/gdk/Property.custom b/gdk/Property.custom index 764483873..81a726e38 100644 --- a/gdk/Property.custom +++ b/gdk/Property.custom @@ -20,7 +20,7 @@ // Boston, MA 02111-1307, USA. - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_property_change(IntPtr window, IntPtr property, IntPtr type, int format, int mode, out byte data, int nelements); [Obsolete ("Replaced by corrected overload with data parameter")] @@ -30,7 +30,7 @@ return data; } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gdk_property_get(IntPtr window, IntPtr property, IntPtr type, UIntPtr offset, UIntPtr length, bool pdelete, out IntPtr actual_property_type, out int actual_format, out int actual_length, out IntPtr data); public static bool Get(Gdk.Window window, Gdk.Atom property, Gdk.Atom type, ulong offset, ulong length, int pdelete, out Gdk.Atom actual_property_type, out int actual_format, out int actual_length, out byte[] data) { diff --git a/gdk/Region.custom b/gdk/Region.custom index c5e559672..a08d64d17 100644 --- a/gdk/Region.custom +++ b/gdk/Region.custom @@ -23,7 +23,7 @@ [DllImport ("libglib-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void g_free (IntPtr mem); -[DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] +[DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_region_get_rectangles(IntPtr raw, out IntPtr rectangles, out int n_rectangles); public Rectangle[] GetRectangles () diff --git a/gdk/Screen.custom b/gdk/Screen.custom index c769728e2..4a4890b45 100644 --- a/gdk/Screen.custom +++ b/gdk/Screen.custom @@ -18,7 +18,7 @@ // Free Software Foundation, Inc., 59 Temple Place - Suite 330, // Boston, MA 02111-1307, USA. - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gdk_screen_get_toplevel_windows (IntPtr raw); public Window[] ToplevelWindows @@ -35,7 +35,7 @@ } } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gdk_screen_list_visuals (IntPtr raw); public Visual[] ListVisuals () @@ -50,10 +50,10 @@ return result; } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gdk_screen_get_font_options(IntPtr raw); - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_screen_set_font_options(IntPtr raw, IntPtr options); [GLib.Property ("font-options")] diff --git a/gdk/TextProperty.cs b/gdk/TextProperty.cs index 8cbad952f..db244255b 100644 --- a/gdk/TextProperty.cs +++ b/gdk/TextProperty.cs @@ -26,10 +26,10 @@ namespace Gdk { public class TextProperty { - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_free_text_list(IntPtr ptr); - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int gdk_text_property_to_utf8_list(IntPtr encoding, int format, byte[] text, int length, out IntPtr list); public static string[] ToStringList (Gdk.Atom encoding, int format, byte[] text, int length) @@ -49,7 +49,7 @@ namespace Gdk { return result; } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern int gdk_text_property_to_utf8_list_for_display(IntPtr display, IntPtr encoding, int format, byte[] text, int length, out IntPtr list); public static string[] ToStringListForDisplay (Gdk.Display display, Gdk.Atom encoding, int format, byte[] text, int length) diff --git a/gdk/Window.custom b/gdk/Window.custom index f2a4e3757..5d9a3a89b 100644 --- a/gdk/Window.custom +++ b/gdk/Window.custom @@ -24,7 +24,7 @@ public Window (Gdk.Window parent, Gdk.WindowAttr attributes, Gdk.WindowAttributesType attributes_mask) : this (parent, attributes, (int)attributes_mask) {} - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gdk_window_get_children(IntPtr raw); public Window[] Children { @@ -40,7 +40,7 @@ } } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_window_set_icon_list(IntPtr raw, IntPtr pixbufs); public Pixbuf[] IconList { @@ -52,7 +52,7 @@ } } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gdk_window_get_toplevels(); public static Window[] Toplevels { @@ -71,7 +71,7 @@ [DllImport ("libgobject-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr g_object_ref (IntPtr raw); - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_window_destroy(IntPtr raw); public void Destroy () @@ -97,10 +97,10 @@ } #endif - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_window_get_user_data (IntPtr raw, out IntPtr data); - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_window_set_user_data(IntPtr raw, IntPtr user_data); public IntPtr UserData { get { @@ -113,10 +113,10 @@ } } - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_window_add_filter (IntPtr handle, GdkSharp.FilterFuncNative wrapper, IntPtr data); - [DllImport ("libgdk-win32-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport ("libgdk-win32-3.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gdk_window_remove_filter (IntPtr handle, GdkSharp.FilterFuncNative wrapper, IntPtr data); static Hashtable filter_all_hash; diff --git a/gdk/gdk-sharp.dll.config.in b/gdk/gdk-sharp.dll.config.in index f29a0a300..014cd172e 100644 --- a/gdk/gdk-sharp.dll.config.in +++ b/gdk/gdk-sharp.dll.config.in @@ -1,6 +1,6 @@ - +